diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /ext/standard/php_var.h | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/standard/php_var.h')
| -rw-r--r-- | ext/standard/php_var.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index 48692e57c3..2dc13f4012 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -32,11 +32,11 @@ PHP_FUNCTION(unserialize); PHP_FUNCTION(memory_get_usage); PHP_FUNCTION(memory_get_peak_usage); -PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC); -PHPAPI void php_var_export(zval **struc, int level TSRMLS_DC); -PHPAPI void php_var_export_ex(zval **struc, int level, smart_str *buf TSRMLS_DC); +PHPAPI void php_var_dump(zval *struc, int level TSRMLS_DC); +PHPAPI void php_var_export(zval *struc, int level TSRMLS_DC); +PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf TSRMLS_DC); -PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC); +PHPAPI void php_debug_zval_dump(zval *struc, int level TSRMLS_DC); typedef HashTable* php_serialize_data_t; @@ -49,15 +49,17 @@ struct php_unserialize_data { 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 unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); +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 unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); +PHPAPI int php_var_unserialize_ref(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); +PHPAPI int php_var_unserialize_intern(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); #define PHP_VAR_SERIALIZE_INIT(var_hash_ptr) \ do { \ /* fprintf(stderr, "SERIALIZE_INIT == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ \ if (BG(serialize_lock) || !BG(serialize).level) { \ ALLOC_HASHTABLE(var_hash_ptr); \ - zend_hash_init((var_hash_ptr), 10, NULL, NULL, 0); \ + zend_hash_init((var_hash_ptr), 16, NULL, NULL, 0); \ if (!BG(serialize_lock)) { \ BG(serialize).var_hash = (void *)(var_hash_ptr); \ BG(serialize).level = 1; \ @@ -113,13 +115,10 @@ do { \ } \ } while (0) -PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval); -PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val); -PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval); +PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval *nzval); +PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval *val); +PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rval); PHPAPI 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); |