cvs: /php4 main.c rfc1867.c /php4/ext/com COM.c /php4/ext/dav dav.c /php4/ext/hyperwave hw.c /php4/ext/java java.c /php4/ext/odbc php_odbc.c
/php4/ext/pcre php_pcre.c /php4/ext/session session.c /php4/ext/standard array.c iptc.c post.c var.c /php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/wddx wddx.c /php4/sapi/isapi php4isapi.c

zeev Sun Dec 26 16:20:53 1999 EDT Modified files: /php4 main.c rfc1867.c /php4/ext/com COM.c /php4/ext/dav dav.c /php4/ext/hyperwave hw.c /php4/ext/java java.c /php4/ext/odbc php_odbc.c /php4/ext/pcre php_pcre.c /php4/ext/session session.c /php4/ext/standard array.c iptc.c post.c var.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/wddx wddx.c /php4/sapi/isapi php4isapi.c Log: Change ALLOC_ZVAL() semantics Index: php4/main.c diff -u php4/main.c:1.168 php4/main.c:1.169 --- php4/main.c:1.168 Sun Dec 26 15:45:37 1999 +++ php4/main.c Sun Dec 26 16:20:41 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.168 1999/12/26 20:45:37 zeev Exp $ */ +/* $Id: main.c,v 1.169 1999/12/26 21:20:41 zeev Exp $ */ #include <stdio.h> @@ -446,7 +446,7 @@ va_end(args); buffer[sizeof(buffer) - 1] = 0; - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); INIT_PZVAL(tmp); tmp->value.str.val = (char *) estrndup(buffer, size); tmp->value.str.len = size; @@ -1079,7 +1079,7 @@ continue; } t = estrndup(*env, p - *env); - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.str.len = strlen(p + 1); tmp->value.str.val = estrndup(p + 1, tmp->value.str.len); tmp->type = IS_STRING; @@ -1100,7 +1100,7 @@ for (i = 0; i < arr->nelts; i++) { len = strlen(elts[i].key); t = elts[i].key; - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); if (elts[i].val) { tmp->value.str.len = strlen(elts[i].val); tmp->value.str.val = estrndup(elts[i].val, tmp->value.str.len); @@ -1117,7 +1117,7 @@ (*tmp_ptr)->refcount++; zend_hash_update(&EG(symbol_table), "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"), tmp_ptr, sizeof(pval *), NULL); } - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.str.len = strlen(((request_rec *) SG(server_context))->uri); tmp->value.str.val = estrndup(((request_rec *) SG(server_context))->uri, tmp->value.str.len); INIT_PZVAL(tmp); @@ -1130,7 +1130,7 @@ char *pi; #if FORCE_CGI_REDIRECT pi = SG(request_info).request_uri; - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.str.val = emalloc(((pi)?strlen(pi):0) + 1); tmp->value.str.len = php_sprintf(tmp->value.str.val, "%s", (pi ? pi : "")); /* SAFE */ tmp->type = IS_STRING; @@ -1148,7 +1148,7 @@ l -= strlen(pi); pi = NULL; } - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.str.val = emalloc(l + 1); tmp->value.str.len = php_sprintf(tmp->value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */ tmp->type = IS_STRING; @@ -1171,7 +1171,7 @@ int count = 0; char *ss, *space; - arr = ALLOC_ZVAL(); + ALLOC_ZVAL(arr); arr->value.ht = (HashTable *) emalloc(sizeof(HashTable)); if (zend_hash_init(arr->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0) == FAILURE) { php_error(E_WARNING, "Unable to create argv array"); @@ -1188,7 +1188,7 @@ *space = '\0'; } /* auto-type */ - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->type = IS_STRING; tmp->value.str.len = strlen(ss); tmp->value.str.val = estrndup(ss, tmp->value.str.len); @@ -1206,7 +1206,7 @@ ss = space; } } - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.lval = count; tmp->type = IS_LONG; INIT_PZVAL(tmp); Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.17 php4/rfc1867.c:1.18 --- php4/rfc1867.c:1.17 Fri Dec 24 12:39:23 1999 +++ php4/rfc1867.c Sun Dec 26 16:20:41 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.17 1999/12/24 17:39:23 andi Exp $ */ +/* $Id: rfc1867.c,v 1.18 1999/12/26 21:20:41 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -45,7 +45,7 @@ PLS_FETCH(); if (PG(track_vars)) { - http_post_vars = ALLOC_ZVAL(); + ALLOC_ZVAL(http_post_vars); array_init(http_post_vars); INIT_PZVAL(http_post_vars); Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.19 php4/ext/com/COM.c:1.20 --- php4/ext/com/COM.c:1.19 Fri Dec 24 12:39:24 1999 +++ php4/ext/com/COM.c Sun Dec 26 16:20:42 1999 @@ -416,7 +416,7 @@ pval_arg->refcount=1; zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); - handle = ALLOC_ZVAL(); + ALLOC_ZVAL(handle); handle->type = IS_LONG; handle->value.lval = zend_list_insert(var_arg->pdispVal, le_idispatch); pval_copy_constructor(handle); @@ -915,7 +915,7 @@ var_reset(object); return; } - object_handle = ALLOC_ZVAL(); + ALLOC_ZVAL(object_handle); *object_handle = *return_value; pval_copy_constructor(object_handle); INIT_PZVAL(object_handle); Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.8 php4/ext/dav/dav.c:1.9 --- php4/ext/dav/dav.c:1.8 Fri Dec 24 12:39:25 1999 +++ php4/ext/dav/dav.c Sun Dec 26 16:20:43 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.8 1999/12/24 17:39:25 andi Exp $ */ +/* $Id: dav.c,v 1.9 1999/12/26 21:20:43 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL @@ -192,7 +192,7 @@ HashTable *function_table; func = php3i_string_pval(funcName); - retval = ALLOC_ZVAL(); + ALLOC_ZVAL(retval); function_table = php3i_get_function_table(); if (call_user_function(function_table, NULL, func, retval, argc, argv) == FAILURE) { php3tls_pval_destructor(retval); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.35 php4/ext/hyperwave/hw.c:1.36 --- php4/ext/hyperwave/hw.c:1.35 Fri Dec 24 10:43:36 1999 +++ php4/ext/hyperwave/hw.c Sun Dec 26 16:20:44 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.35 1999/12/24 15:43:36 andi Exp $ */ +/* $Id: hw.c,v 1.36 1999/12/26 21:20:44 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -1175,7 +1175,7 @@ while(attrname != NULL) { char *name; - user_arr = ALLOC_ZVAL(); + ALLOC_ZVAL(user_arr); if (array_init(user_arr) == FAILURE) { efree(object); RETURN_FALSE; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.8 php4/ext/java/java.c:1.9 --- php4/ext/java/java.c:1.8 Fri Dec 24 12:39:25 1999 +++ php4/ext/java/java.c Sun Dec 26 16:20:45 1999 @@ -500,7 +500,7 @@ zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); }; - handle = ALLOC_ZVAL(); + ALLOC_ZVAL(handle); handle->type = IS_LONG; handle->value.lval = zend_list_insert((*jenv)->NewGlobalRef(jenv,value), le_jobject); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.21 php4/ext/odbc/php_odbc.c:1.22 --- php4/ext/odbc/php_odbc.c:1.21 Fri Dec 24 12:39:26 1999 +++ php4/ext/odbc/php_odbc.c Sun Dec 26 16:20:45 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.21 1999/12/24 17:39:26 andi Exp $ */ +/* $Id: php_odbc.c,v 1.22 1999/12/26 21:20:45 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -1096,7 +1096,7 @@ result->fetched++; for(i = 0; i < result->numcols; i++) { - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->refcount = 1; tmp->type = IS_STRING; tmp->value.str.len = 0; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.35 php4/ext/pcre/php_pcre.c:1.36 --- php4/ext/pcre/php_pcre.c:1.35 Fri Dec 24 10:43:36 1999 +++ php4/ext/pcre/php_pcre.c Sun Dec 26 16:20:46 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.35 1999/12/24 15:43:36 andi Exp $ */ +/* $Id: php_pcre.c,v 1.36 1999/12/26 21:20:46 zeev Exp $ */ /* TODO: @@ -393,7 +393,7 @@ if (global && subpats_order_val == PREG_PATTERN_ORDER) { match_sets = (zval **)emalloc(num_subpats * sizeof(zval *)); for (i=0; i<num_subpats; i++) { - match_sets[i] = ALLOC_ZVAL(); + ALLOC_ZVAL(match_sets[i]); array_init(match_sets[i]); INIT_PZVAL(match_sets[i]); } @@ -441,7 +441,7 @@ } else { /* Allocate the result set array */ - result_set = ALLOC_ZVAL(); + ALLOC_ZVAL(result_set); array_init(result_set); INIT_PZVAL(result_set); Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.88 php4/ext/session/session.c:1.89 --- php4/ext/session/session.c:1.88 Fri Dec 24 10:43:37 1999 +++ php4/ext/session/session.c Sun Dec 26 16:20:47 1999 @@ -176,7 +176,7 @@ PLS_FETCH(); ELS_FETCH(); - state_val_copy = ALLOC_ZVAL(); + ALLOC_ZVAL(state_val_copy); *state_val_copy = *state_val; zval_copy_ctor(state_val_copy); state_val_copy->refcount = 0; Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.18 php4/ext/standard/array.c:1.19 --- php4/ext/standard/array.c:1.18 Fri Dec 24 10:43:38 1999 +++ php4/ext/standard/array.c Sun Dec 26 16:20:48 1999 @@ -1059,7 +1059,7 @@ if (zend_hash_find(eg_active_symbol_table, entry->value.str.val, entry->value.str.len+1, (void **)&value_ptr) != FAILURE) { value = *value_ptr; - data = ALLOC_ZVAL(); + ALLOC_ZVAL(data); *data = *value; zval_copy_ctor(data); INIT_PZVAL(data); Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.15 php4/ext/standard/iptc.c:1.16 --- php4/ext/standard/iptc.c:1.15 Fri Dec 24 12:39:26 1999 +++ php4/ext/standard/iptc.c Sun Dec 26 16:20:48 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.15 1999/12/24 17:39:26 andi Exp $ */ +/* $Id: iptc.c,v 1.16 1999/12/26 21:20:48 zeev Exp $ */ /* * Functions to parse & compse IPTC data. @@ -356,7 +356,7 @@ } if (zend_hash_find(return_value->value.ht,key,strlen(key) + 1,(void **) &element) == FAILURE) { - values = ALLOC_ZVAL(); + ALLOC_ZVAL(values); INIT_PZVAL(values); if (array_init(values) == FAILURE) { php_error(E_ERROR, "Unable to initialize array"); Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.33 php4/ext/standard/post.c:1.34 --- php4/ext/standard/post.c:1.33 Fri Dec 24 12:39:26 1999 +++ php4/ext/standard/post.c Sun Dec 26 16:20:48 1999 @@ -112,7 +112,7 @@ } /* Create the element */ - array_element = ALLOC_ZVAL(); + ALLOC_ZVAL(array_element); INIT_PZVAL(array_element); array_element->value.str.val = val; array_element->value.str.len = val_len; @@ -315,7 +315,7 @@ case PARSE_GET: case PARSE_COOKIE: if (PG(track_vars)) { - array_ptr = ALLOC_ZVAL(); + ALLOC_ZVAL(array_ptr); array_init(array_ptr); INIT_PZVAL(array_ptr); switch (arg) { @@ -369,7 +369,7 @@ if((NULL != SG(request_info).content_type) && (0 == strcmp(SG(request_info).content_type, "application/vnd.fdf"))) { pval *tmp; - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); tmp->value.str.len = SG(request_info).post_data_length; tmp->value.str.val = estrndup(SG(request_info).post_data, SG(request_info).post_data_length); tmp->type = IS_STRING; Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.41 php4/ext/standard/var.c:1.42 --- php4/ext/standard/var.c:1.41 Fri Dec 24 12:39:26 1999 +++ php4/ext/standard/var.c Sun Dec 26 16:20:48 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.41 1999/12/24 17:39:26 andi Exp $ */ +/* $Id: var.c,v 1.42 1999/12/26 21:20:48 zeev Exp $ */ /* {{{ includes @@ -96,8 +96,9 @@ } switch (i) { case HASH_KEY_IS_LONG:{ - pval *d = ALLOC_ZVAL(); + pval *d; + ALLOC_ZVAL(d); d->type = IS_LONG; d->value.lval = index; php_var_dump(&d, level + 2); @@ -106,8 +107,9 @@ break; case HASH_KEY_IS_STRING:{ - pval *d = ALLOC_ZVAL(); + pval *d; + ALLOC_ZVAL(d); d->type = IS_STRING; d->value.str.val = key; d->value.str.len = strlen(key); @@ -253,14 +255,14 @@ switch (i) { case HASH_KEY_IS_LONG: - d = ALLOC_ZVAL(); + ALLOC_ZVAL(d); d->type = IS_LONG; d->value.lval = index; php_var_serialize(buf, &d); efree(d); break; case HASH_KEY_IS_STRING: - d = ALLOC_ZVAL(); + ALLOC_ZVAL(d); d->type = IS_STRING; d->value.str.val = key; d->value.str.len = strlen(key); @@ -431,9 +433,11 @@ return 0; } for ((*p) += 2; **p && **p != '}' && i > 0; i--) { - pval *key = ALLOC_ZVAL(); - pval *data = ALLOC_ZVAL(); + pval *key; + pval *data; + ALLOC_ZVAL(key); + ALLOC_ZVAL(data); if (!php_var_unserialize(&key, p, max)) { zval_dtor(key); efree(key); Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.11 php4/ext/sybase_ct/php_sybase_ct.c:1.12 --- php4/ext/sybase_ct/php_sybase_ct.c:1.11 Fri Dec 24 12:39:27 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Sun Dec 26 16:20:49 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.11 1999/12/24 17:39:27 andi Exp $ */ +/* $Id: php_sybase_ct.c,v 1.12 1999/12/26 21:20:49 zeev Exp $ */ #include "php.h" @@ -1224,7 +1224,7 @@ array_init(return_value); for (i=0; i<result->num_fields; i++) { - field_content = ALLOC_ZVAL(); + ALLOC_ZVAL(field_content); *field_content = result->data[result->cur_row][i]; INIT_PZVAL(field_content); pval_copy_constructor(field_content); @@ -1257,7 +1257,7 @@ } for (i=0; i<result->num_fields; i++) { - tmp = ALLOC_ZVAL(); + ALLOC_ZVAL(tmp); *tmp = result->data[result->cur_row][i]; INIT_PZVAL(tmp); if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) { Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.18 php4/ext/wddx/wddx.c:1.19 --- php4/ext/wddx/wddx.c:1.18 Fri Dec 24 10:43:38 1999 +++ php4/ext/wddx/wddx.c Sun Dec 26 16:20:49 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.18 1999/12/24 15:43:38 andi Exp $ */ +/* $Id: wddx.c,v 1.19 1999/12/26 21:20:49 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -468,7 +468,7 @@ } else ent.varname = NULL; - ent.data = ALLOC_ZVAL(); + ALLOC_ZVAL(ent.data); ent.data->value.str.val = NULL; ent.data->value.str.len = 0; INIT_PZVAL(ent.data); @@ -492,7 +492,7 @@ } else ent.varname = NULL; - ent.data = ALLOC_ZVAL(); + ALLOC_ZVAL(ent.data); INIT_PZVAL(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); } else if (!strcmp(name, EL_ARRAY)) { @@ -504,7 +504,7 @@ } else ent.varname = NULL; - ent.data = ALLOC_ZVAL(); + ALLOC_ZVAL(ent.data); array_init(ent.data); INIT_PZVAL(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); @@ -517,7 +517,7 @@ } else ent.varname = NULL; - ent.data = ALLOC_ZVAL(); + ALLOC_ZVAL(ent.data); array_init(ent.data); INIT_PZVAL(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.8 php4/sapi/isapi/php4isapi.c:1.9 --- php4/sapi/isapi/php4isapi.c:1.8 Fri Dec 24 10:43:39 1999 +++ php4/sapi/isapi/php4isapi.c Sun Dec 26 16:20:52 1999 @@ -407,8 +407,9 @@ if (colon) { char *value = colon+1; - zval *entry = ALLOC_ZVAL(); + zval *entry; + ALLOC_ZVAL(entry); while (*value==' ') { value++; }