cvs commit

From: zeev Date: Fri Jul 9 16:45:53 1999 Modified files: php4/main.c php4/rfc1867.c php4/ext/com/COM.c php4/ext/oci8/oci8.c php4/ext/oracle/oracle.c php4/ext/pcre/php_pcre.c php4/ext/standard/basic_functions.c php4/ext/standard/iptc.c php4/ext/standard/post.c php4/ext/standard/var.c php4/ext/xml/xml.c php4/php4isapi/php4isapi.c Log message: Don't touch refcount and EA directly Index: php4/main.c diff -u php4/main.c:1.81 php4/main.c:1.82 --- php4/main.c:1.81 Fri Jul 9 13:44:38 1999 +++ php4/main.c Fri Jul 9 16:45:50 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.81 1999/07/09 17:44:38 zeev Exp $ */ +/* $Id: main.c,v 1.82 1999/07/09 20:45:50 zeev Exp $ */ #include <stdio.h> @@ -944,8 +944,7 @@ tmp->value.str.len = strlen(p + 1); tmp->value.str.val = estrndup(p + 1, tmp->value.str.len); tmp->type = IS_STRING; - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); /* environmental variables never take precedence over get/post/cookie variables */ _php3_hash_add(&EG(symbol_table), t, p - *env + 1, &tmp, sizeof(pval *), NULL); efree(t); @@ -970,8 +969,7 @@ tmp->value.str.len = 0; tmp->value.str.val = empty_string; } - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); tmp->type = IS_STRING; _php3_hash_update(&EG(symbol_table), t, strlen(t)+1, &tmp, sizeof(pval *), NULL); } @@ -983,8 +981,7 @@ tmp = (pval *) emalloc(sizeof(pval)); 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); - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); tmp->type = IS_STRING; _php3_hash_update(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) &tmp, sizeof(pval *), NULL); } @@ -998,8 +995,7 @@ tmp->value.str.val = emalloc(((pi)?strlen(pi):0) + 1); tmp->value.str.len = _php3_sprintf(tmp->value.str.val, "%s", (pi ? pi : "")); /* SAFE */ tmp->type = IS_STRING; - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); #else int l = 0; char *sn; @@ -1017,8 +1013,7 @@ tmp->value.str.val = emalloc(l + 1); tmp->value.str.len = _php3_sprintf(tmp->value.str.val, "%s%s", (sn ? sn : ""), (pi ? pi : "")); /* SAFE */ tmp->type = IS_STRING; - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); #endif _php3_hash_update(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval *), NULL); } @@ -1043,8 +1038,7 @@ php3_error(E_WARNING, "Unable to create argv array"); } else { arr->type = IS_ARRAY; - arr->refcount=1; - arr->EA=0; + INIT_PZVAL(arr); _php3_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(pval *), NULL); } /* now pick out individual entries */ @@ -1059,8 +1053,7 @@ tmp->type = IS_STRING; tmp->value.str.len = strlen(ss); tmp->value.str.val = estrndup(ss, tmp->value.str.len); - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); count++; if (_php3_hash_next_index_insert(arr->value.ht, &tmp, sizeof(pval *), NULL)==FAILURE) { if (tmp->type == IS_STRING) { @@ -1077,8 +1070,7 @@ tmp = (pval *) emalloc(sizeof(pval)); tmp->value.lval = count; tmp->type = IS_LONG; - tmp->refcount=1; - tmp->EA=0; + INIT_PZVAL(tmp); _php3_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &tmp, sizeof(pval *), NULL); } Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.4 php4/rfc1867.c:1.5 --- php4/rfc1867.c:1.4 Fri Jul 9 13:44:38 1999 +++ php4/rfc1867.c Fri Jul 9 16:45:50 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.4 1999/07/09 17:44:38 zeev Exp $ */ +/* $Id: rfc1867.c,v 1.5 1999/07/09 20:45:50 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -61,8 +61,7 @@ if (PG(track_vars)) { http_post_vars = (pval *) emalloc(sizeof(pval)); array_init(http_post_vars); - http_post_vars->refcount=1; - http_post_vars->EA=0; + INIT_PZVAL(http_post_vars); zend_hash_add(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &http_post_vars, sizeof(pval *), NULL); } Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.6 php4/ext/com/COM.c:1.7 --- php4/ext/com/COM.c:1.6 Fri Jul 9 13:44:39 1999 +++ php4/ext/com/COM.c Fri Jul 9 16:45:51 1999 @@ -836,8 +836,7 @@ object_handle = (pval *) emalloc(sizeof(pval)); *object_handle = *return_value; pval_copy_constructor(object_handle); - object_handle->refcount = 1; - object_handle->EA=0; + INIT_PZVAL(object_handle); zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL); pval_destructor(&function_name->element); } else { Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.10 php4/ext/oci8/oci8.c:1.11 --- php4/ext/oci8/oci8.c:1.10 Fri Jul 9 13:44:39 1999 +++ php4/ext/oci8/oci8.c Fri Jul 9 16:45:51 1999 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.10 1999/07/09 17:44:39 zeev Exp $ */ +/* $Id: oci8.c,v 1.11 1999/07/09 20:45:51 zeev Exp $ */ /* TODO list: * @@ -3166,15 +3166,13 @@ #if PHP_API_VERSION >= 19990421 element = emalloc(sizeof(pval)); - element->EA=0; - element->refcount=1; + INIT_PZVAL(element); #endif if ((mode & OCI_NUM) || (! (mode & OCI_ASSOC))) { /* OCI_NUM is default */ oci8_make_pval(element,statement,column, "OCIFetchInto",mode); #if PHP_API_VERSION >= 19990421 - element->EA = 0; - element->refcount = 1; + INIT_PZVAL(element); _php3_hash_index_update(array->value.ht, i, (void *)&element, sizeof(pval*), NULL); #else _php3_hash_index_update(array->value.ht, i, (void *)element, sizeof(pval), NULL); @@ -3257,15 +3255,13 @@ #if PHP_API_VERSION >= 19990421 tmp = emalloc(sizeof(pval)); - tmp->EA = 0; - tmp->refcount = 1; + INIT_PZVAL(tmp); #endif array_init(tmp); #if PHP_API_VERSION >= 19990421 - tmp->EA = 0; - tmp->refcount = 1; + INIT_PZVAL(tmp); #endif memcpy(namebuf,columns[ i ]->name, columns[ i ]->name_len); @@ -3297,8 +3293,7 @@ #if PHP_API_VERSION < 19990421 _php3_hash_index_update(outarrs[ i ]->value.ht, rows, (void *)element, sizeof(pval), NULL); #else - element->refcount = 1; - element->EA = 0; + INIT_PZVAL(element); _php3_hash_index_update((*(outarrs[ i ]))->value.ht, rows, (void *)&element, sizeof(pval*), NULL); #endif } Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.8 php4/ext/oracle/oracle.c:1.9 --- php4/ext/oracle/oracle.c:1.8 Fri Jul 9 13:44:40 1999 +++ php4/ext/oracle/oracle.c Fri Jul 9 16:45:51 1999 @@ -1225,8 +1225,7 @@ } else { #if PHP_API_VERSION >= 19990421 tmp = emalloc(sizeof(pval)); - tmp->EA = 0; - tmp->refcount = 1; + INIT_PZVAL(tmp); #endif tmp->type = IS_STRING; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.5 php4/ext/pcre/php_pcre.c:1.6 --- php4/ext/pcre/php_pcre.c:1.5 Fri Jul 9 13:44:40 1999 +++ php4/ext/pcre/php_pcre.c Fri Jul 9 16:45:51 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.5 1999/07/09 17:44:40 zeev Exp $ */ +/* $Id: php_pcre.c,v 1.6 1999/07/09 20:45:51 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -394,8 +394,7 @@ for (i=0; i<num_subpats; i++) { match_sets[i] = (zval *)emalloc(sizeof(zval)); array_init(match_sets[i]); - match_sets[i]->EA = 0; - match_sets[i]->refcount = 1; + INIT_PZVAL(match_sets[i]); } } @@ -444,8 +443,7 @@ /* Allocate the result set array */ result_set = emalloc(sizeof(zval)); array_init(result_set); - result_set->EA = 0; - result_set->refcount = 1; + INIT_PZVAL(result_set); /* Add all the subpatterns to it */ for (i=0; i<count; i++) { Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.40 php4/ext/standard/basic_functions.c:1.41 --- php4/ext/standard/basic_functions.c:1.40 Fri Jul 9 13:44:40 1999 +++ php4/ext/standard/basic_functions.c Fri Jul 9 16:45:51 1999 @@ -1082,11 +1082,12 @@ entry = *entry_ptr; /* add value elements */ - if (entry->EA) { + if (entry->EA.is_ref) { tmp = (pval *)emalloc(sizeof(pval)); *tmp = *entry; pval_copy_constructor(tmp); - tmp->EA=0; + tmp->EA.is_ref=0; + tmp->EA.locks = 0; tmp->refcount=0; entry=tmp; } @@ -1130,8 +1131,7 @@ *return_value = **entry; pval_copy_constructor(return_value); - return_value->refcount=1; - return_value->EA=0; + INIT_PZVAL(return_value); } void array_current(INTERNAL_FUNCTION_PARAMETERS) @@ -2362,8 +2362,7 @@ data = (zval *)emalloc(sizeof(zval)); *data = *entry; zval_copy_ctor(data); - data->EA = 0; - data->refcount = 1; + INIT_PZVAL(data); zend_hash_update(EG(active_symbol_table), finalname, strlen(finalname)+1, &data, sizeof(zval *), NULL); @@ -2392,8 +2391,7 @@ data = (zval *)emalloc(sizeof(zval)); *data = *value; zval_copy_ctor(data); - data->EA = 0; - data->refcount = 1; + INIT_PZVAL(data); zend_hash_update(return_value->value.ht, entry->value.str.val, entry->value.str.len+1, &data, sizeof(zval *), NULL); @@ -2603,8 +2601,7 @@ zend_hash_get_current_data(stack->value.ht, (void **)&val); *return_value = **val; zval_copy_ctor(return_value); - return_value->refcount=1; - return_value->EA=0; + INIT_PZVAL(return_value); /* Delete the first or last value */ new_hash = _phpi_splice(stack->value.ht, (off_the_end) ? -1 : 0, 1, NULL, 0, NULL); @@ -2919,8 +2916,7 @@ zend_hash_internal_pointer_reset(input->value.ht); while(zend_hash_get_current_data(input->value.ht, (void **)&entry) == SUCCESS) { new_val = (zval *)emalloc(sizeof(zval)); - new_val->EA = 0; - new_val->refcount = 1; + INIT_PZVAL(new_val); switch (zend_hash_get_current_key(input->value.ht, &string_key, &num_key)) { case HASH_KEY_IS_STRING: Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.4 php4/ext/standard/iptc.c:1.5 --- php4/ext/standard/iptc.c:1.4 Fri Jul 9 13:44:40 1999 +++ php4/ext/standard/iptc.c Fri Jul 9 16:45:51 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.4 1999/07/09 17:44:40 zeev Exp $ */ +/* $Id: iptc.c,v 1.5 1999/07/09 20:45:51 zeev Exp $ */ /* * Functions to parse & compse IPTC data. @@ -368,8 +368,7 @@ if (_php3_hash_find(return_value->value.ht,key,strlen(key) + 1,(void **) &element) == FAILURE) { values = emalloc(sizeof(pval)); - values->EA = 0; - values->refcount = 1; + INIT_PZVAL(values); if (array_init(values) == FAILURE) { php3_error(E_ERROR, "Unable to initialize array"); RETURN_FALSE; Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.14 php4/ext/standard/post.c:1.15 --- php4/ext/standard/post.c:1.14 Fri Jul 9 13:44:40 1999 +++ php4/ext/standard/post.c Fri Jul 9 16:45:51 1999 @@ -143,8 +143,7 @@ postdata_ptr->type = IS_STRING; postdata_ptr->value.str.val = (char *) estrdup(buf); postdata_ptr->value.str.len = cnt; - postdata_ptr->refcount=1; - postdata_ptr->EA=0; + INIT_PZVAL(postdata_ptr); _php3_hash_add(&symbol_table, "HTTP_FDF_DATA", sizeof("HTTP_FDF_DATA"), postdata_ptr, sizeof(pval *),NULL); } #endif @@ -224,16 +223,14 @@ /* If the array doesn't exist, create it */ if (_php3_hash_find(EG(active_symbol_table), var, var_len+1, (void **) &arr_ptr) == FAILURE) { arr1 = (pval *) emalloc(sizeof(pval)); - arr1->refcount=1; - arr1->EA=0; + INIT_PZVAL(arr1); if (array_init(arr1)==FAILURE) { return; } _php3_hash_update(EG(active_symbol_table), var, var_len+1, &arr1, sizeof(pval *), NULL); if (track_vars_array) { arr2 = (pval *) emalloc(sizeof(pval)); - arr2->refcount=1; - arr2->EA=0; + INIT_PZVAL(arr2); if (array_init(arr2)==FAILURE) { return; } @@ -243,8 +240,7 @@ if ((*arr_ptr)->type!=IS_ARRAY) { if (--(*arr_ptr) > 0) { *arr_ptr = (pval *) emalloc(sizeof(pval)); - (*arr_ptr)->refcount=1; - (*arr_ptr)->EA=0; + INIT_PZVAL(*arr_ptr); } else { pval_destructor(*arr_ptr); } @@ -253,8 +249,7 @@ } if (track_vars_array) { arr2 = (pval *) emalloc(sizeof(pval)); - arr2->refcount=1; - arr2->EA=0; + INIT_PZVAL(arr2); if (array_init(arr2)==FAILURE) { return; } @@ -269,8 +264,7 @@ } /* Now create the element */ entry = (pval *) emalloc(sizeof(pval)); - entry->refcount=1; - entry->EA=0; + INIT_PZVAL(entry); entry->value.str.val = val; entry->value.str.len = val_len; entry->type = IS_STRING; @@ -303,8 +297,7 @@ pval *entry = (pval *) emalloc(sizeof(pval)); entry->type = IS_STRING; - entry->refcount=1; - entry->EA=0; + INIT_PZVAL(entry); entry->value.str.val = val; entry->value.str.len = val_len; _php3_hash_update(EG(active_symbol_table), var, var_len+1, (void *) &entry, sizeof(pval *),NULL); @@ -332,8 +325,7 @@ if (PG(track_vars)) { array_ptr = (pval *) emalloc(sizeof(pval)); array_init(array_ptr); - array_ptr->refcount=1; - array_ptr->EA=0; + INIT_PZVAL(array_ptr); switch (arg) { case PARSE_POST: _php3_hash_add(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &array_ptr, sizeof(pval *),NULL); Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.16 php4/ext/standard/var.c:1.17 --- php4/ext/standard/var.c:1.16 Fri Jul 9 13:44:40 1999 +++ php4/ext/standard/var.c Fri Jul 9 16:45:52 1999 @@ -324,8 +324,7 @@ } else { (*rval)->type = IS_LONG; } - (*rval)->refcount = 1; - (*rval)->EA = 0; + INIT_PZVAL(*rval); (*rval)->value.lval = atol(q + 2); return 1; @@ -342,8 +341,7 @@ } (*p)++; (*rval)->type = IS_DOUBLE; - (*rval)->refcount = 1; - (*rval)->EA = 0; + INIT_PZVAL(*rval); (*rval)->value.dval = atof(q + 2); return 1; @@ -374,15 +372,13 @@ (*rval)->type = IS_STRING; (*rval)->value.str.val = str; (*rval)->value.str.len = i; - (*rval)->refcount = 1; - (*rval)->EA = 0; + INIT_PZVAL(*rval); return 1; case 'a': (*rval)->type = IS_ARRAY; - (*rval)->refcount = 1; - (*rval)->EA = 0; + INIT_PZVAL(*rval); (*p) += 2; i = atoi(*p); (*rval)->value.ht = (HashTable *) emalloc(sizeof(HashTable)); @@ -423,8 +419,7 @@ case 'o': (*rval)->type = IS_OBJECT; - (*rval)->refcount = 1; - (*rval)->EA = 0; + INIT_PZVAL(*rval); (*p) += 2; i = atoi(*p); (*rval)->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.9 php4/ext/xml/xml.c:1.10 --- php4/ext/xml/xml.c:1.9 Fri Jul 9 13:44:41 1999 +++ php4/ext/xml/xml.c Fri Jul 9 16:45:52 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.9 1999/07/09 17:44:41 zeev Exp $ */ +/* $Id: xml.c,v 1.10 1999/07/09 20:45:52 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # if PHP_31 @@ -109,8 +109,7 @@ ret->type = IS_LONG; ret->value.lval = value; - ret->EA = 0; - ret->refcount = 1; + INIT_PZVAL(ret); return ret; } @@ -121,8 +120,7 @@ ret->type = IS_STRING; ret->value.str.len = len; - ret->EA = 0; - ret->refcount = 1; + INIT_PZVAL(ret); ret->value.str.val = estrndup(str, len); return ret; } @@ -647,8 +645,7 @@ return; } - values->EA = 0; - values->refcount = 1; + INIT_PZVAL(values); _php3_hash_update(parser->info->value.ht, name, strlen(name)+1, (void *) &values, sizeof(pval*), (void **) &element); } @@ -712,12 +709,10 @@ int atcnt = 0; tag = emalloc(sizeof(pval)); - tag->EA = 0; - tag->refcount = 1; + INIT_PZVAL(tag); atr = emalloc(sizeof(pval)); - atr->EA = 0; - atr->refcount = 1; + INIT_PZVAL(atr); array_init(tag); array_init(atr); @@ -802,8 +797,7 @@ tag = emalloc(sizeof(pval)); array_init(tag); - tag->EA = 0; - tag->refcount = 1; + INIT_PZVAL(tag); php3i_add_to_info(parser,((char *) name) + parser->toffset); Index: php4/php4isapi/php4isapi.c diff -u php4/php4isapi/php4isapi.c:1.21 php4/php4isapi/php4isapi.c:1.22 --- php4/php4isapi/php4isapi.c:1.21 Fri Jul 9 13:44:41 1999 +++ php4/php4isapi/php4isapi.c Fri Jul 9 16:45:52 1999 @@ -352,8 +352,7 @@ value++; } *colon = 0; - entry->refcount=1; - entry->EA=0; + INIT_PZVAL(entry); entry->value.str.len = strlen(value); entry->value.str.val = estrndup(value, entry->value.str.len); entry->type = IS_STRING;