Small code layout change

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 5c939194ad4814853418219ae62f7cede502cb42..7817f41330fbca270490fcae7d7a66373e53f99f 100644 (file)
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -243,6 +243,7 @@ static zval * reflection_instanciate(zend_class_entry *pce, zval *object TSRMLS_
        return object;
 }
 
+static void _const_string(string *str, char *name, zval *value, char *indent TSRMLS_DC);
 static void _function_string(string *str, zend_function *fptr, char *indent TSRMLS_DC);
 static void _property_string(string *str, zend_property_info *prop, char *prop_name, char* indent TSRMLS_DC);
 static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *indent TSRMLS_DC);
@@ -324,11 +325,8 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 
                        while (zend_hash_get_current_data_ex(&ce->constants_table, (void **) &value, &pos) == SUCCESS) {
                                zend_hash_get_current_key_ex(&ce->constants_table, &key, &key_len, &num_index, 0, &pos);
-                               
-                               string_printf(str, "%s    Constant [ %s %s ] { }\n",
-                                                  indent,
-                                                  zend_zval_type_name(*value),
-                                                  key);
+
+                               _const_string(str, key, *value, indent TSRMLS_CC);
                                zend_hash_move_forward_ex(&ce->constants_table, &pos);
                        }
                }
@@ -492,6 +490,16 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 }
 /* }}} */
 
+/* {{{ _const_string */
+static void _const_string(string *str, char *name, zval *value, char *indent TSRMLS_DC)
+{
+       string_printf(str, "%s    Constant [ %s %s ] { }\n",
+                          indent,
+                          zend_zval_type_name(value),
+                          name);
+}
+/* }}} */
+
 /* {{{ _parameter_string */
 static void _parameter_string(string *str, struct _zend_arg_info *arg_info, int offset, char* indent TSRMLS_DC)
 {

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 5c939194ad4814853418219ae62f7cede502cb42..7817f41330fbca270490fcae7d7a66373e53f99f 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -243,6 +243,7 @@ static zval * reflection_instanciate(zend_class_entry *pce, zval *object TSRMLS_
        return object;
 }
 
+static void _const_string(string *str, char *name, zval *value, char *indent TSRMLS_DC);
 static void _function_string(string *str, zend_function *fptr, char *indent TSRMLS_DC);
 static void _property_string(string *str, zend_property_info *prop, char *prop_name, char* indent TSRMLS_DC);
 static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *indent TSRMLS_DC);
@@ -324,11 +325,8 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 
                        while (zend_hash_get_current_data_ex(&ce->constants_table, (void **) &value, &pos) == SUCCESS) {
                                zend_hash_get_current_key_ex(&ce->constants_table, &key, &key_len, &num_index, 0, &pos);
-                               
-                               string_printf(str, "%s    Constant [ %s %s ] { }\n",
-                                                  indent,
-                                                  zend_zval_type_name(*value),
-                                                  key);
+
+                               _const_string(str, key, *value, indent TSRMLS_CC);
                                zend_hash_move_forward_ex(&ce->constants_table, &pos);
                        }
                }
@@ -492,6 +490,16 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 }
 /* }}} */
 
+/* {{{ _const_string */
+static void _const_string(string *str, char *name, zval *value, char *indent TSRMLS_DC)
+{
+       string_printf(str, "%s    Constant [ %s %s ] { }\n",
+                          indent,
+                          zend_zval_type_name(value),
+                          name);
+}
+/* }}} */
+
 /* {{{ _parameter_string */
 static void _parameter_string(string *str, struct _zend_arg_info *arg_info, int offset, char* indent TSRMLS_DC)
 {