[PHP4BETA] CVS update: php4/ext/standard

Date: Monday May 10, 1999 @ 17:14 Author: andrey Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv6776/ext/standard Modified Files: basic_functions.c Log Message: Minor updates. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.17 php4/ext/standard/basic_functions.c:1.18 --- php4/ext/standard/basic_functions.c:1.17 Mon May 10 17:10:48 1999 +++ php4/ext/standard/basic_functions.c Mon May 10 17:14:43 1999 @@ -2173,7 +2173,7 @@ lcname = estrdup(fname->value.str.val); zend_str_tolower(lcname, fname->value.str.len); - if (_php3_hash_find(CG(function_table), lcname, + if (zend_hash_find(CG(function_table), lcname, fname->value.str.len+1, (void**)&tmp) == FAILURE) { efree(lcname); RETURN_FALSE; @@ -2186,7 +2186,7 @@ /* }}} */ -/* {{{ proto bool in_array(array haystack, mixed needle) +/* {{{ proto bool in_array(mixed needle, array haystack) Checks if the given value exists in the array */ PHP_FUNCTION(in_array) { @@ -2261,7 +2261,7 @@ PHP_FUNCTION(extract) { pval *var_array, *etype, *prefix; - pval **var_ptr, *var, *exist; + pval **entry_ptr, *entry, *exist; pval *data; char *varname, *finalname; ulong lkey; @@ -2310,11 +2310,11 @@ } zend_hash_internal_pointer_reset(var_array->value.ht); - while(zend_hash_get_current_data(var_array->value.ht, (void **)&var_ptr) == SUCCESS) { - var = *var_ptr; + while(zend_hash_get_current_data(var_array->value.ht, (void **)&entry_ptr) == SUCCESS) { + entry = *entry_ptr; - if (!(var->type == IS_STRING && - var->value.str.val == undefined_variable_string)) { + if (!(entry->type == IS_STRING && + entry->value.str.val == undefined_variable_string)) { if (zend_hash_get_current_key(var_array->value.ht, &varname, &lkey) == HASH_KEY_IS_STRING) { @@ -2351,7 +2351,7 @@ if (finalname) { data = (pval *)emalloc(sizeof(pval)); - *data = *var; + *data = *entry; pval_copy_constructor(data); data->is_ref = 0; data->refcount = 1; -- PHP 4 Beta