cvs commit

From: zeev Date: Fri Jul 9 13:44:41 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/fsock.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: Step 2: Rename is_ref to EA Index: php4/main.c diff -u php4/main.c:1.80 php4/main.c:1.81 --- php4/main.c:1.80 Thu Jul 8 13:15:43 1999 +++ php4/main.c Fri Jul 9 13:44:38 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.80 1999/07/08 17:15:43 zeev Exp $ */ +/* $Id: main.c,v 1.81 1999/07/09 17:44:38 zeev Exp $ */ #include <stdio.h> @@ -945,7 +945,7 @@ tmp->value.str.val = estrndup(p + 1, tmp->value.str.len); tmp->type = IS_STRING; tmp->refcount=1; - tmp->is_ref=0; + tmp->EA=0; /* 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); @@ -971,7 +971,7 @@ tmp->value.str.val = empty_string; } tmp->refcount=1; - tmp->is_ref=0; + tmp->EA=0; tmp->type = IS_STRING; _php3_hash_update(&EG(symbol_table), t, strlen(t)+1, &tmp, sizeof(pval *), NULL); } @@ -984,7 +984,7 @@ 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->is_ref=0; + tmp->EA=0; tmp->type = IS_STRING; _php3_hash_update(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) &tmp, sizeof(pval *), NULL); } @@ -999,7 +999,7 @@ tmp->value.str.len = _php3_sprintf(tmp->value.str.val, "%s", (pi ? pi : "")); /* SAFE */ tmp->type = IS_STRING; tmp->refcount=1; - tmp->is_ref=0; + tmp->EA=0; #else int l = 0; char *sn; @@ -1018,7 +1018,7 @@ 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->is_ref=0; + tmp->EA=0; #endif _php3_hash_update(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval *), NULL); } @@ -1044,7 +1044,7 @@ } else { arr->type = IS_ARRAY; arr->refcount=1; - arr->is_ref=0; + arr->EA=0; _php3_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(pval *), NULL); } /* now pick out individual entries */ @@ -1060,7 +1060,7 @@ tmp->value.str.len = strlen(ss); tmp->value.str.val = estrndup(ss, tmp->value.str.len); tmp->refcount=1; - tmp->is_ref=0; + tmp->EA=0; count++; if (_php3_hash_next_index_insert(arr->value.ht, &tmp, sizeof(pval *), NULL)==FAILURE) { if (tmp->type == IS_STRING) { @@ -1078,7 +1078,7 @@ tmp->value.lval = count; tmp->type = IS_LONG; tmp->refcount=1; - tmp->is_ref=0; + tmp->EA=0; _php3_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &tmp, sizeof(pval *), NULL); } Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.3 php4/rfc1867.c:1.4 --- php4/rfc1867.c:1.3 Sat Jun 12 13:50:38 1999 +++ php4/rfc1867.c Fri Jul 9 13:44:38 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.3 1999/06/12 17:50:38 zeev Exp $ */ +/* $Id: rfc1867.c,v 1.4 1999/07/09 17:44:38 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -62,7 +62,7 @@ http_post_vars = (pval *) emalloc(sizeof(pval)); array_init(http_post_vars); http_post_vars->refcount=1; - http_post_vars->is_ref=0; + http_post_vars->EA=0; 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.5 php4/ext/com/COM.c:1.6 --- php4/ext/com/COM.c:1.5 Fri May 28 07:09:39 1999 +++ php4/ext/com/COM.c Fri Jul 9 13:44:39 1999 @@ -837,7 +837,7 @@ *object_handle = *return_value; pval_copy_constructor(object_handle); object_handle->refcount = 1; - object_handle->is_ref=0; + object_handle->EA=0; 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.9 php4/ext/oci8/oci8.c:1.10 --- php4/ext/oci8/oci8.c:1.9 Thu Jul 8 10:12:07 1999 +++ php4/ext/oci8/oci8.c Fri Jul 9 13:44:39 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.9 1999/07/08 14:12:07 thies Exp $ */ +/* $Id: oci8.c,v 1.10 1999/07/09 17:44:39 zeev Exp $ */ /* TODO list: * @@ -3166,14 +3166,14 @@ #if PHP_API_VERSION >= 19990421 element = emalloc(sizeof(pval)); - element->is_ref=0; + element->EA=0; element->refcount=1; #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->is_ref = 0; + element->EA = 0; element->refcount = 1; _php3_hash_index_update(array->value.ht, i, (void *)&element, sizeof(pval*), NULL); #else @@ -3257,14 +3257,14 @@ #if PHP_API_VERSION >= 19990421 tmp = emalloc(sizeof(pval)); - tmp->is_ref = 0; + tmp->EA = 0; tmp->refcount = 1; #endif array_init(tmp); #if PHP_API_VERSION >= 19990421 - tmp->is_ref = 0; + tmp->EA = 0; tmp->refcount = 1; #endif @@ -3298,7 +3298,7 @@ _php3_hash_index_update(outarrs[ i ]->value.ht, rows, (void *)element, sizeof(pval), NULL); #else element->refcount = 1; - element->is_ref = 0; + element->EA = 0; _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.7 php4/ext/oracle/oracle.c:1.8 --- php4/ext/oracle/oracle.c:1.7 Mon Jul 5 03:03:42 1999 +++ php4/ext/oracle/oracle.c Fri Jul 9 13:44:40 1999 @@ -1225,7 +1225,7 @@ } else { #if PHP_API_VERSION >= 19990421 tmp = emalloc(sizeof(pval)); - tmp->is_ref = 0; + tmp->EA = 0; tmp->refcount = 1; #endif Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.4 php4/ext/pcre/php_pcre.c:1.5 --- php4/ext/pcre/php_pcre.c:1.4 Fri Jul 9 13:36:12 1999 +++ php4/ext/pcre/php_pcre.c Fri Jul 9 13:44:40 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.4 1999/07/09 17:36:12 zeev Exp $ */ +/* $Id: php_pcre.c,v 1.5 1999/07/09 17:44:40 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -394,7 +394,7 @@ for (i=0; i<num_subpats; i++) { match_sets[i] = (zval *)emalloc(sizeof(zval)); array_init(match_sets[i]); - match_sets[i]->is_ref = 0; + match_sets[i]->EA = 0; match_sets[i]->refcount = 1; } } @@ -444,7 +444,7 @@ /* Allocate the result set array */ result_set = emalloc(sizeof(zval)); array_init(result_set); - result_set->is_ref = 0; + result_set->EA = 0; result_set->refcount = 1; /* Add all the subpatterns to it */ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.39 php4/ext/standard/basic_functions.c:1.40 --- php4/ext/standard/basic_functions.c:1.39 Fri Jul 9 13:36:12 1999 +++ php4/ext/standard/basic_functions.c Fri Jul 9 13:44:40 1999 @@ -1082,11 +1082,11 @@ entry = *entry_ptr; /* add value elements */ - if (entry->is_ref) { + if (entry->EA) { tmp = (pval *)emalloc(sizeof(pval)); *tmp = *entry; pval_copy_constructor(tmp); - tmp->is_ref=0; + tmp->EA=0; tmp->refcount=0; entry=tmp; } @@ -1131,7 +1131,7 @@ *return_value = **entry; pval_copy_constructor(return_value); return_value->refcount=1; - return_value->is_ref=0; + return_value->EA=0; } void array_current(INTERNAL_FUNCTION_PARAMETERS) @@ -2362,7 +2362,7 @@ data = (zval *)emalloc(sizeof(zval)); *data = *entry; zval_copy_ctor(data); - data->is_ref = 0; + data->EA = 0; data->refcount = 1; zend_hash_update(EG(active_symbol_table), finalname, @@ -2392,7 +2392,7 @@ data = (zval *)emalloc(sizeof(zval)); *data = *value; zval_copy_ctor(data); - data->is_ref = 0; + data->EA = 0; data->refcount = 1; zend_hash_update(return_value->value.ht, entry->value.str.val, @@ -2604,7 +2604,7 @@ *return_value = **val; zval_copy_ctor(return_value); return_value->refcount=1; - return_value->is_ref=0; + return_value->EA=0; /* Delete the first or last value */ new_hash = _phpi_splice(stack->value.ht, (off_the_end) ? -1 : 0, 1, NULL, 0, NULL); @@ -2919,7 +2919,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->is_ref = 0; + new_val->EA = 0; new_val->refcount = 1; switch (zend_hash_get_current_key(input->value.ht, &string_key, &num_key)) { Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.12 php4/ext/standard/fsock.c:1.13 --- php4/ext/standard/fsock.c:1.12 Sat Jun 19 09:13:28 1999 +++ php4/ext/standard/fsock.c Fri Jul 9 13:44:40 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.12 1999/06/19 13:13:28 zeev Exp $ */ +/* $Id: fsock.c,v 1.13 1999/07/09 17:44:40 zeev Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ @@ -715,9 +715,10 @@ /* {{{ _php3_sock_destroy */ #ifndef ZTS -static void _php3_msock_destroy(int *data) +static int _php3_msock_destroy(int *data) { close(*data); + return 1; } #endif /* }}} */ @@ -727,7 +728,7 @@ { #ifndef ZTS _php3_hash_init(&PG(ht_fsock_keys), 0, NULL, NULL, 1); - _php3_hash_init(&PG(ht_fsock_socks), 0, NULL, (void (*)(void *))_php3_msock_destroy, 1); + _php3_hash_init(&PG(ht_fsock_socks), 0, NULL, (int (*)(void *))_php3_msock_destroy, 1); #endif return SUCCESS; } Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.3 php4/ext/standard/iptc.c:1.4 --- php4/ext/standard/iptc.c:1.3 Mon Jul 5 03:42:07 1999 +++ php4/ext/standard/iptc.c Fri Jul 9 13:44:40 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.3 1999/07/05 07:42:07 thies Exp $ */ +/* $Id: iptc.c,v 1.4 1999/07/09 17:44:40 zeev Exp $ */ /* * Functions to parse & compse IPTC data. @@ -368,7 +368,7 @@ if (_php3_hash_find(return_value->value.ht,key,strlen(key) + 1,(void **) &element) == FAILURE) { values = emalloc(sizeof(pval)); - values->is_ref = 0; + values->EA = 0; values->refcount = 1; if (array_init(values) == FAILURE) { php3_error(E_ERROR, "Unable to initialize array"); Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.13 php4/ext/standard/post.c:1.14 --- php4/ext/standard/post.c:1.13 Wed May 12 18:49:23 1999 +++ php4/ext/standard/post.c Fri Jul 9 13:44:40 1999 @@ -144,7 +144,7 @@ postdata_ptr->value.str.val = (char *) estrdup(buf); postdata_ptr->value.str.len = cnt; postdata_ptr->refcount=1; - postdata_ptr->is_ref=0; + postdata_ptr->EA=0; _php3_hash_add(&symbol_table, "HTTP_FDF_DATA", sizeof("HTTP_FDF_DATA"), postdata_ptr, sizeof(pval *),NULL); } #endif @@ -225,7 +225,7 @@ 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->is_ref=0; + arr1->EA=0; if (array_init(arr1)==FAILURE) { return; } @@ -233,7 +233,7 @@ if (track_vars_array) { arr2 = (pval *) emalloc(sizeof(pval)); arr2->refcount=1; - arr2->is_ref=0; + arr2->EA=0; if (array_init(arr2)==FAILURE) { return; } @@ -244,7 +244,7 @@ if (--(*arr_ptr) > 0) { *arr_ptr = (pval *) emalloc(sizeof(pval)); (*arr_ptr)->refcount=1; - (*arr_ptr)->is_ref=0; + (*arr_ptr)->EA=0; } else { pval_destructor(*arr_ptr); } @@ -254,7 +254,7 @@ if (track_vars_array) { arr2 = (pval *) emalloc(sizeof(pval)); arr2->refcount=1; - arr2->is_ref=0; + arr2->EA=0; if (array_init(arr2)==FAILURE) { return; } @@ -270,7 +270,7 @@ /* Now create the element */ entry = (pval *) emalloc(sizeof(pval)); entry->refcount=1; - entry->is_ref=0; + entry->EA=0; entry->value.str.val = val; entry->value.str.len = val_len; entry->type = IS_STRING; @@ -304,7 +304,7 @@ entry->type = IS_STRING; entry->refcount=1; - entry->is_ref=0; + entry->EA=0; 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); @@ -333,7 +333,7 @@ array_ptr = (pval *) emalloc(sizeof(pval)); array_init(array_ptr); array_ptr->refcount=1; - array_ptr->is_ref=0; + array_ptr->EA=0; 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.15 php4/ext/standard/var.c:1.16 --- php4/ext/standard/var.c:1.15 Thu Jul 1 05:26:05 1999 +++ php4/ext/standard/var.c Fri Jul 9 13:44:40 1999 @@ -325,7 +325,7 @@ (*rval)->type = IS_LONG; } (*rval)->refcount = 1; - (*rval)->is_ref = 0; + (*rval)->EA = 0; (*rval)->value.lval = atol(q + 2); return 1; @@ -343,7 +343,7 @@ (*p)++; (*rval)->type = IS_DOUBLE; (*rval)->refcount = 1; - (*rval)->is_ref = 0; + (*rval)->EA = 0; (*rval)->value.dval = atof(q + 2); return 1; @@ -375,14 +375,14 @@ (*rval)->value.str.val = str; (*rval)->value.str.len = i; (*rval)->refcount = 1; - (*rval)->is_ref = 0; + (*rval)->EA = 0; return 1; case 'a': (*rval)->type = IS_ARRAY; (*rval)->refcount = 1; - (*rval)->is_ref = 0; + (*rval)->EA = 0; (*p) += 2; i = atoi(*p); (*rval)->value.ht = (HashTable *) emalloc(sizeof(HashTable)); @@ -424,7 +424,7 @@ (*rval)->type = IS_OBJECT; (*rval)->refcount = 1; - (*rval)->is_ref = 0; + (*rval)->EA = 0; (*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.8 php4/ext/xml/xml.c:1.9 --- php4/ext/xml/xml.c:1.8 Sun Jul 4 09:30:13 1999 +++ php4/ext/xml/xml.c Fri Jul 9 13:44:41 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.8 1999/07/04 13:30:13 thies Exp $ */ +/* $Id: xml.c,v 1.9 1999/07/09 17:44:41 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # if PHP_31 @@ -109,7 +109,7 @@ ret->type = IS_LONG; ret->value.lval = value; - ret->is_ref = 0; + ret->EA = 0; ret->refcount = 1; return ret; } @@ -121,7 +121,7 @@ ret->type = IS_STRING; ret->value.str.len = len; - ret->is_ref = 0; + ret->EA = 0; ret->refcount = 1; ret->value.str.val = estrndup(str, len); return ret; @@ -647,7 +647,7 @@ return; } - values->is_ref = 0; + values->EA = 0; values->refcount = 1; _php3_hash_update(parser->info->value.ht, name, strlen(name)+1, (void *) &values, sizeof(pval*), (void **) &element); @@ -712,11 +712,11 @@ int atcnt = 0; tag = emalloc(sizeof(pval)); - tag->is_ref = 0; + tag->EA = 0; tag->refcount = 1; atr = emalloc(sizeof(pval)); - atr->is_ref = 0; + atr->EA = 0; atr->refcount = 1; array_init(tag); @@ -802,7 +802,7 @@ tag = emalloc(sizeof(pval)); array_init(tag); - tag->is_ref = 0; + tag->EA = 0; tag->refcount = 1; php3i_add_to_info(parser,((char *) name) + parser->toffset); Index: php4/php4isapi/php4isapi.c diff -u php4/php4isapi/php4isapi.c:1.20 php4/php4isapi/php4isapi.c:1.21 --- php4/php4isapi/php4isapi.c:1.20 Tue May 25 17:14:54 1999 +++ php4/php4isapi/php4isapi.c Fri Jul 9 13:44:41 1999 @@ -353,7 +353,7 @@ } *colon = 0; entry->refcount=1; - entry->is_ref=0; + entry->EA=0; entry->value.str.len = strlen(value); entry->value.str.val = estrndup(value, entry->value.str.len); entry->type = IS_STRING;