diff options
Diffstat (limited to 'ext/standard/php_var.h')
| -rw-r--r-- | ext/standard/php_var.h | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index 6336e0fe8e..aa5e003955 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -32,8 +32,14 @@ void php_var_dump(zval **struc, int level TSRMLS_DC); /* typdef HashTable php_serialize_data_t; */ #define php_serialize_data_t HashTable +struct php_unserialize_data { + void *first; +}; + +typedef struct php_unserialize_data php_unserialize_data_t; + PHPAPI void php_var_serialize(smart_str *buf, zval **struc, php_serialize_data_t *var_hash TSRMLS_DC); -PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, php_serialize_data_t *var_hash TSRMLS_DC); +PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, php_unserialize_data_t *var_hash TSRMLS_DC); #define PHP_VAR_SERIALIZE_INIT(var_hash) \ zend_hash_init(&(var_hash), 10, NULL, NULL, 0) @@ -41,30 +47,16 @@ PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, php zend_hash_destroy(&(var_hash)) #define PHP_VAR_UNSERIALIZE_INIT(var_hash) \ - zend_hash_init(&(var_hash), 10, NULL, NULL, 0) + (var_hash).first = 0 #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \ - zend_hash_destroy(&(var_hash)) + var_destroy(&(var_hash)) -#define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \ -if (var_hash) { \ - HashPosition pos; \ - zval **zval_ref; \ - zend_hash_internal_pointer_reset_ex(var_hash, &pos); \ - while (zend_hash_get_current_data_ex(var_hash, (void **) &zval_ref, &pos) == SUCCESS) { \ - if (*zval_ref == ozval) { \ - char *string_key; \ - uint str_key_len; \ - ulong num_key; \ - \ - zend_hash_get_current_key_ex(var_hash, &string_key, &str_key_len, &num_key, 1, &pos); \ - /* this is our hash and it _will_ be number indexed! */ \ - zend_hash_index_update(var_hash, num_key, &nzval, sizeof(zval *), NULL); \ - break; \ - } \ - zend_hash_move_forward_ex(var_hash, &pos); \ - } \ -} +void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval); +void var_destroy(php_unserialize_data_t *var_hash); +#define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \ + var_replace((var_hash), (ozval), &(nzval)) + PHPAPI zend_class_entry *php_create_empty_class(char *class_name, int len); #endif /* PHP_VAR_H */ |