cvs: /php4 main.c php3_compat.h php_variables.c

andi Fri Mar 24 03:16:54 2000 EDT Modified files: /php4 main.c php3_compat.h php_variables.c Log: - Nuke hash_*_ptr() functions Index: php4/main.c diff -u php4/main.c:1.228 php4/main.c:1.229 --- php4/main.c:1.228 Tue Mar 21 11:04:34 2000 +++ php4/main.c Fri Mar 24 03:16:24 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.228 2000/03/21 19:04:34 andi Exp $ */ +/* $Id: main.c,v 1.229 2000/03/24 11:16:24 andi Exp $ */ #include <stdio.h> @@ -1004,22 +1004,22 @@ } if (PG(http_globals).post) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), PG(http_globals).post, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &PG(http_globals).post, sizeof(zval *), NULL); } if (PG(http_globals).get) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), PG(http_globals).get, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), &PG(http_globals).get, sizeof(zval *), NULL); } if (PG(http_globals).cookie) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), PG(http_globals).cookie, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), &PG(http_globals).cookie, sizeof(zval *), NULL); } if (PG(http_globals).server) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), PG(http_globals).server, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &PG(http_globals).server, sizeof(zval *), NULL); } if (PG(http_globals).environment) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), PG(http_globals).environment, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &PG(http_globals).environment, sizeof(zval *), NULL); } if (PG(http_globals).post_files) { - zend_hash_update_ptr(&EG(symbol_table), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), PG(http_globals).post_files, sizeof(zval *),NULL); + zend_hash_update(&EG(symbol_table), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), &PG(http_globals).post_files, sizeof(zval *),NULL); } return SUCCESS; @@ -1070,8 +1070,8 @@ INIT_PZVAL(argc); if (PG(register_globals)) { - zend_hash_update_ptr(&EG(symbol_table), "argv", sizeof("argv"), arr, sizeof(pval *), NULL); - zend_hash_add_ptr(&EG(symbol_table), "argc", sizeof("argc"), argc, sizeof(pval *), NULL); + zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL); + zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL); } if (PG(track_vars)) { @@ -1079,8 +1079,8 @@ arr->refcount++; argc->refcount++; } - zend_hash_update_ptr(track_vars_array->value.ht, "argv", sizeof("argv"), arr, sizeof(pval *), NULL); - zend_hash_update_ptr(track_vars_array->value.ht, "argc", sizeof("argc"), argc, sizeof(pval *), NULL); + zend_hash_update(track_vars_array->value.ht, "argv", sizeof("argv"), &arr, sizeof(pval *), NULL); + zend_hash_update(track_vars_array->value.ht, "argc", sizeof("argc"), &argc, sizeof(pval *), NULL); } } Index: php4/php3_compat.h diff -u php4/php3_compat.h:1.9 php4/php3_compat.h:1.10 --- php4/php3_compat.h:1.9 Sat Dec 18 14:21:51 1999 +++ php4/php3_compat.h Fri Mar 24 03:16:24 2000 @@ -9,7 +9,6 @@ #define _php3_hash_add_or_update zend_hash_add_or_update #define _php3_hash_add zend_hash_add #define _php3_hash_update zend_hash_update -#define _php3_hash_update_ptr zend_hash_update_ptr #define _php3_hash_quick_add_or_update zend_hash_quick_add_or_update #define _php3_hash_quick_add zend_hash_quick_add Index: php4/php_variables.c diff -u php4/php_variables.c:1.11 php4/php_variables.c:1.12 --- php4/php_variables.c:1.11 Sun Feb 27 21:33:43 2000 +++ php4/php_variables.c Fri Mar 24 03:16:24 2000 @@ -166,7 +166,7 @@ if (!index) { zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } else { - zend_hash_update_ptr(symtable1, index, index_len+1, gpc_element, sizeof(zval *), (void **) &gpc_element_p); + zend_hash_update(symtable1, index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } if (!top_gpc_p) { top_gpc_p = gpc_element_p; @@ -177,7 +177,7 @@ if (top_gpc_p) { if (symtable2) { - zend_hash_update_ptr(symtable2, var, var_len+1, *top_gpc_p, sizeof(zval *), NULL); + zend_hash_update(symtable2, var, var_len+1, top_gpc_p, sizeof(zval *), NULL); (*top_gpc_p)->refcount++; } }