cvs: php4 /ext/session session.c /ext/standard php_var.h var.c /ext/sysvshm sysvshm.c

sas Sun Aug 5 12:52:30 2001 EDT Modified files: /php4/ext/session session.c /php4/ext/standard php_var.h var.c /php4/ext/sysvshm sysvshm.c Log: more tsrm cleanup Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.232 php4/ext/session/session.c:1.233 --- php4/ext/session/session.c:1.232 Sun Aug 5 12:43:57 2001 +++ php4/ext/session/session.c Sun Aug 5 12:52:25 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.232 2001/08/05 16:43:57 sas Exp $ */ +/* $Id: session.c,v 1.233 2001/08/05 16:52:25 sas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -290,7 +290,7 @@ smart_str_appendc(&buf, (unsigned char) key_length); smart_str_appendl(&buf, key, key_length); - php_var_serialize(&buf, struc, &var_hash); + php_var_serialize(&buf, struc, &var_hash TSRMLS_CC); } else { if (key_length > PS_BIN_MAX) continue; smart_str_appendc(&buf, (unsigned char) (key_length & PS_BIN_UNDEF)); @@ -326,7 +326,7 @@ if (has_value) { MAKE_STD_ZVAL(current); - if (php_var_unserialize(&current, &p, endptr, &var_hash)) { + if (php_var_unserialize(&current, &p, endptr, &var_hash TSRMLS_CC)) { php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); } zval_ptr_dtor(&current); @@ -356,7 +356,7 @@ smart_str_appendl(&buf, key, (unsigned char) key_length); smart_str_appendc(&buf, PS_DELIMITER); - php_var_serialize(&buf, struc, &var_hash); + php_var_serialize(&buf, struc, &var_hash TSRMLS_CC); } else { if (key_length + 2 > MAX_STR) continue; smart_str_appendc(&buf, PS_UNDEF_MARKER); @@ -403,7 +403,7 @@ if (has_value) { MAKE_STD_ZVAL(current); - if (php_var_unserialize(&current, &q, endptr, &var_hash)) { + if (php_var_unserialize(&current, &q, endptr, &var_hash TSRMLS_CC)) { php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC); } zval_ptr_dtor(&current); Index: php4/ext/standard/php_var.h diff -u php4/ext/standard/php_var.h:1.11 php4/ext/standard/php_var.h:1.12 --- php4/ext/standard/php_var.h:1.11 Sun Aug 5 11:55:42 2001 +++ php4/ext/standard/php_var.h Sun Aug 5 12:52:28 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_var.h,v 1.11 2001/08/05 15:55:42 sas Exp $ */ +/* $Id: php_var.h,v 1.12 2001/08/05 16:52:28 sas Exp $ */ #ifndef PHP_VAR_H #define PHP_VAR_H @@ -32,8 +32,8 @@ /* typdef HashTable php_serialize_data_t; */ #define php_serialize_data_t HashTable -PHPAPI void php_var_serialize(smart_str *buf, zval **struc, php_serialize_data_t *var_hash); -PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, php_serialize_data_t *var_hash); +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); #define PHP_VAR_SERIALIZE_INIT(var_hash) \ zend_hash_init(&(var_hash),10,NULL,NULL,0) Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.109 php4/ext/standard/var.c:1.110 --- php4/ext/standard/var.c:1.109 Sun Aug 5 11:55:42 2001 +++ php4/ext/standard/var.c Sun Aug 5 12:52:28 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.109 2001/08/05 15:55:42 sas Exp $ */ +/* $Id: var.c,v 1.110 2001/08/05 16:52:28 sas Exp $ */ /* {{{ includes @@ -74,7 +74,6 @@ php_printf("%sint(%ld)\n", COMMON, Z_LVAL_PP(struc)); break; case IS_DOUBLE: { - TSRMLS_FETCH(); php_printf("%sfloat(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_PP(struc)); } @@ -100,7 +99,6 @@ break; case IS_RESOURCE: { char *type_name; - TSRMLS_FETCH(); type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC); php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown"); @@ -358,10 +356,8 @@ } } -PHPAPI void php_var_serialize(smart_str *buf, zval **struc, HashTable *var_hash) +PHPAPI void php_var_serialize(smart_str *buf, zval **struc, HashTable *var_hash TSRMLS_DC) { - TSRMLS_FETCH(); - php_var_serialize_intern(buf, struc, var_hash TSRMLS_CC); smart_str_0(buf); } @@ -369,7 +365,7 @@ /* }}} */ /* {{{ php_var_unserialize */ -PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, HashTable *var_hash) +PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, HashTable *var_hash TSRMLS_DC) { const char *q; char *str; @@ -378,7 +374,6 @@ ulong id; HashTable *myht; zval **rval_ref; - TSRMLS_FETCH(); if (var_hash && **p != 'R') { /* references aren't counted by serializer! */ zend_hash_next_index_insert(var_hash, rval, sizeof(*rval), NULL); @@ -567,13 +562,13 @@ ALLOC_INIT_ZVAL(key); ALLOC_INIT_ZVAL(data); - if (!php_var_unserialize(&key, p, max, NULL)) { + if (!php_var_unserialize(&key, p, max, NULL TSRMLS_CC)) { zval_dtor(key); FREE_ZVAL(key); FREE_ZVAL(data); return 0; } - if (!php_var_unserialize(&data, p, max, var_hash)) { + if (!php_var_unserialize(&data, p, max, var_hash TSRMLS_CC)) { zval_dtor(key); FREE_ZVAL(key); zval_dtor(data); @@ -629,7 +624,7 @@ return_value->value.str.len = 0; PHP_VAR_SERIALIZE_INIT(var_hash); - php_var_serialize(&buf, struc, &var_hash); + php_var_serialize(&buf, struc, &var_hash TSRMLS_CC); PHP_VAR_SERIALIZE_DESTROY(var_hash); RETVAL_STRINGL(buf.c, buf.len, 0); } @@ -656,7 +651,7 @@ } PHP_VAR_UNSERIALIZE_INIT(var_hash); - if (!php_var_unserialize(&return_value, &p, p + Z_STRLEN_PP(buf), &var_hash)) { + if (!php_var_unserialize(&return_value, &p, p + Z_STRLEN_PP(buf), &var_hash TSRMLS_CC)) { PHP_VAR_UNSERIALIZE_DESTROY(var_hash); zval_dtor(return_value); php_error(E_NOTICE, "unserialize() failed at offset %d of %d bytes",p - Z_STRVAL_PP(buf),Z_STRLEN_PP(buf)); Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.44 php4/ext/sysvshm/sysvshm.c:1.45 --- php4/ext/sysvshm/sysvshm.c:1.44 Fri Aug 3 15:11:31 2001 +++ php4/ext/sysvshm/sysvshm.c Sun Aug 5 12:52:29 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.44 2001/08/03 19:11:31 jon Exp $ */ +/* $Id: sysvshm.c,v 1.45 2001/08/05 16:52:29 sas Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -245,7 +245,7 @@ /* setup string-variable and serialize */ PHP_VAR_SERIALIZE_INIT(var_hash); - php_var_serialize(&shm_var,arg_var,&var_hash); + php_var_serialize(&shm_var,arg_var,&var_hash TSRMLS_CC); PHP_VAR_SERIALIZE_DESTROY(var_hash); /* insert serialized variable into shared memory */ ret=php_put_shm_data(shm_list_ptr->ptr,key,shm_var.c,shm_var.len); @@ -301,7 +301,7 @@ shm_data=&shm_var->mem; PHP_VAR_UNSERIALIZE_INIT(var_hash); - if(php_var_unserialize(&return_value, (const char **) &shm_data, shm_data+shm_var->length,&var_hash)!=1) { + if(php_var_unserialize(&return_value, (const char **) &shm_data, shm_data+shm_var->length,&var_hash TSRMLS_CC)!=1) { PHP_VAR_UNSERIALIZE_DESTROY(var_hash); php_error(E_WARNING, "variable data in shared memory is corruped"); RETURN_FALSE;