From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 18 Aug 2005 06:33:44 +0000 (+0000)
Subject: We don't need EMPY_STRING here. This function is execuited in non-unicode context... 
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09a3c92df7f0a3a076dcf35276e283438b634a61;p=php

We don't need EMPY_STRING here. This function is execuited in non-unicode context only.
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 301b54edda..a0bce6caf0 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1971,7 +1971,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 		}
 		if (ptr->flags) {
 			if (!(ptr->flags & ZEND_ACC_PPP_MASK)) {
-				zend_error(error_type, "Invalid access level for %s%s%s() - access must be exactly one of public, protected or private", scope ? scope->name : EMPTY_STR, scope ? "::" : "", ptr->fname);
+				zend_error(error_type, "Invalid access level for %s%s%s() - access must be exactly one of public, protected or private", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
 				internal_function->fn_flags = ZEND_ACC_PUBLIC;
 			} else {
 				internal_function->fn_flags = ptr->flags;
@@ -1996,7 +1996,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 				return FAILURE;
 			}
 			if (!internal_function->handler) {
-				zend_error(error_type, "Method %s%s%s() cannot be a NULL function", scope ? scope->name : EMPTY_STR, scope ? "::" : "", ptr->fname);
+				zend_error(error_type, "Method %s%s%s() cannot be a NULL function", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
 				zend_unregister_functions(functions, count, target_function_table TSRMLS_CC);
 				return FAILURE;
 			}
@@ -2052,7 +2052,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 		}
 		while (ptr->fname) {
 			if (zend_hash_exists(target_function_table, ptr->fname, strlen(ptr->fname)+1)) {
-				zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : EMPTY_STR, scope ? "::" : "", ptr->fname);
+				zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
 			}
 			ptr++;
 		}