Rename shared implementation functions and build them unconditionally

php · Dec 19, 2014 · 60ec4f1 · 60ec4f1
1 parent cddc0a1
commit 60ec4f1
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 57 deletions.
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -325,7 +325,7 @@ ZEND_API void zend_wrong_callback_error(int severity, int num, char *error) /* {
 }
 /* }}} */
 
-ZEND_API int _z_param_class(zval *arg, zend_class_entry **pce, int num, int check_null) /* {{{ */
+ZEND_API int zend_parse_arg_class(zval *arg, zend_class_entry **pce, int num, int check_null) /* {{{ */
 {
 	zend_class_entry *ce_base = *pce;
 
@@ -393,7 +393,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 					is_null = va_arg(*va, zend_bool *);
 				}
 
-				if (!_z_param_long(arg, p, is_null, check_null, c == 'L')) {
+				if (!zend_parse_arg_long(arg, p, is_null, check_null, c == 'L')) {
 					return "long";
 				}
 			}
@@ -408,7 +408,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 					is_null = va_arg(*va, zend_bool *);
 				}
 
-				if (!_z_param_double(arg, p, is_null, check_null)) {
+				if (!zend_parse_arg_double(arg, p, is_null, check_null)) {
 					return "double";
 				}
 			}
@@ -418,7 +418,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				char **p = va_arg(*va, char **);
 				size_t *pl = va_arg(*va, size_t *);
-				if (!_z_param_string(arg, p, pl, check_null)) {
+				if (!zend_parse_arg_string(arg, p, pl, check_null)) {
 					return "string";
 				}
 			}
@@ -428,7 +428,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				char **p = va_arg(*va, char **);
 				size_t *pl = va_arg(*va, size_t *);
-				if (!_z_param_path(arg, p, pl, check_null)) {
+				if (!zend_parse_arg_path(arg, p, pl, check_null)) {
 					return "a valid path";
 				}
 			}
@@ -437,7 +437,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 		case 'P':
 			{
 				zend_string **str = va_arg(*va, zend_string **);
-				if (!_z_param_path_str(arg, str, check_null)) {
+				if (!zend_parse_arg_path_str(arg, str, check_null)) {
 					return "a valid path";
 				}
 			}
@@ -446,7 +446,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 		case 'S':
 			{
 				zend_string **str = va_arg(*va, zend_string **);
-				if (!_z_param_str(arg, str, check_null)) {
+				if (!zend_parse_arg_str(arg, str, check_null)) {
 					return "string";
 				}
 			}
@@ -461,7 +461,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 					is_null = va_arg(*va, zend_bool *);
 				}
 
-				if (!_z_param_bool(arg, p, is_null, check_null)) {
+				if (!zend_parse_arg_bool(arg, p, is_null, check_null)) {
 					return "boolean";
 				}
 			}
@@ -471,7 +471,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				zval **p = va_arg(*va, zval **);
 
-				if (!_z_param_resource(arg, p, check_null)) {
+				if (!zend_parse_arg_resource(arg, p, check_null)) {
 					return "resource";
 				}
 			}
@@ -482,7 +482,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				zval **p = va_arg(*va, zval **);
 
-				if (!_z_param_array(arg, p, check_null, c == 'A')) {
+				if (!zend_parse_arg_array(arg, p, check_null, c == 'A')) {
 					return "array";
 				}
 			}
@@ -493,7 +493,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				HashTable **p = va_arg(*va, HashTable **);
 
-				if (!_z_param_array_ht(arg, p, check_null, c == 'H')) {
+				if (!zend_parse_arg_array_ht(arg, p, check_null, c == 'H')) {
 					return "array";
 				}
 			}
@@ -519,7 +519,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 				zval **p = va_arg(*va, zval **);
 				zend_class_entry *ce = va_arg(*va, zend_class_entry *);
 
-				if (!_z_param_object(arg, p, ce, check_null)) {
+				if (!zend_parse_arg_object(arg, p, ce, check_null)) {
 					if (ce) {
 						return ce->name->val;
 					} else {
@@ -599,7 +599,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
 			{
 				zval **p = va_arg(*va, zval **);
 
-				_z_param_zval(arg, p, check_null);
+				zend_parse_arg_zval(arg, p, check_null);
 			}
 			break;