Changeset 292 for trunk

Timestamp:

10/24/2007 17:19:37 (13 months ago)

Author:

indeyets

Message:

optimization of dumping mixed arrays

Files:

• trunk/ext/php/phpext.c (modified) (2 diffs)

trunk/ext/php/phpext.c

@@ -703 +703 @@
                                 for (zend_hash_internal_pointer_reset(tbl); zend_hash_has_more_elements(tbl) == SUCCESS; zend_hash_move_forward(tbl)) {
                                         zval **ppzval = NULL, kzval;
-                                        char *key = NULL;
                                         uint key_len;
                                         ulong idx;
                                         size_t key_type;
 
-                                        zend_hash_get_current_key_ex(tbl, (char **)&key, &key_len, &idx, 0, NULL);
+                                        key_type = zend_hash_get_current_key_type_ex(tbl, NULL);
+
+                                        if (key_type == HASH_KEY_IS_LONG) {
+                                                zend_hash_get_current_key_ex(tbl, NULL, NULL, &idx, 0, NULL);
+                                                ZVAL_LONG(&kzval, idx);
+                                        } else {
+                                                char *skey = NULL;
+                                                zend_hash_get_current_key_ex(tbl, (char **)&skey, &key_len, NULL, 0, NULL);
+                                                ZVAL_STRINGL(&kzval, skey, key_len - 1, 1);
+                                        }
+
                                         zend_hash_get_current_data(tbl, (void **)&ppzval);
-                                        key_type = zend_hash_get_current_key_type_ex(tbl, NULL);
-
-                                        if (key_type == HASH_KEY_IS_LONG) {
-                                                key_len = 1 + snprintf(key, 0, "%ld", idx); /* getting size ("0" doesn't let output) */
-                                                key = emalloc(key_len);
-                                                snprintf(key, key_len, "%ld", idx);
-                                        }
-
-                                        ZVAL_STRINGL(&kzval, key, key_len - 1, 1);
 
                                         if (psex_push_obj(bonus, &kzval)) {
@@ -731 +731 @@
 
                                         zval_dtor(&kzval);
-
-                                        if (key_type == HASH_KEY_IS_LONG) {
-                                                efree(key);
-                                        }
                                 }