From 3811b58a7dc96b056b8da35359fafeeaf3786dc8 Mon Sep 17 00:00:00 2001
From: Andi Gutmans <andi@php.net>
Date: Sun, 13 Feb 2000 13:25:01 +0000
Subject: [PATCH] - Improve startup speed a bit by using the hash_*_ptr()
 functions

---
 main/main.c          | 10 +++++-----
 main/php_variables.c | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main/main.c b/main/main.c
index 1a1743c867..73590bef1a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -922,7 +922,7 @@ static inline void php_register_server_variables(ELS_D SLS_DC PLS_DC)
 		ALLOC_ZVAL(array_ptr);
 		array_init(array_ptr);
 		INIT_PZVAL(array_ptr);
-		zend_hash_add(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &array_ptr, sizeof(pval *),NULL);
+		zend_hash_add_ptr(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), array_ptr, sizeof(pval *),NULL);
 	}
 
 	/* Server variables */
@@ -1053,8 +1053,8 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
 	INIT_PZVAL(argc);
 
 	if (PG(register_globals)) {
-		zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(pval *), NULL);
-		zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(pval *), NULL);
+		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);
 	}
 
 	if (PG(track_vars)) {
@@ -1062,8 +1062,8 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
 			arr->refcount++;
 			argc->refcount++;
 		}
-		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);
+		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);
 	}
 
 }
diff --git a/main/php_variables.c b/main/php_variables.c
index 53050f36f0..8f02d0c541 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -156,7 +156,7 @@ PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array E
 			if (!index) {
 				zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
 			} else {
-				zend_hash_update(symtable1, index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
+				zend_hash_update_ptr(symtable1, index, index_len+1, gpc_element, sizeof(zval *), (void **) &gpc_element_p);
 			}
 			if (!top_gpc_p) {
 				top_gpc_p = gpc_element_p;
@@ -168,7 +168,7 @@ PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array E
 	if (top_gpc_p) {
 		(*top_gpc_p)->is_ref = 1;
 		if (symtable2) {
-			zend_hash_update(symtable2, var, var_len+1, top_gpc_p, sizeof(zval *), NULL);
+			zend_hash_update_ptr(symtable2, var, var_len+1, *top_gpc_p, sizeof(zval *), NULL);
 			(*top_gpc_p)->refcount++;
 		}	
 	}
@@ -192,13 +192,13 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC)
 				INIT_PZVAL(array_ptr);
 				switch (arg) {
 					case PARSE_POST:
-						zend_hash_add(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &array_ptr, sizeof(pval *),NULL);
+						zend_hash_add_ptr(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), array_ptr, sizeof(pval *),NULL);
 						break;
 					case PARSE_GET:
-						zend_hash_add(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), &array_ptr, sizeof(pval *),NULL);
+						zend_hash_add_ptr(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), array_ptr, sizeof(pval *),NULL);
 						break;
 					case PARSE_COOKIE:
-						zend_hash_add(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), &array_ptr, sizeof(pval *),NULL);
+						zend_hash_add_ptr(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), array_ptr, sizeof(pval *),NULL);
 						break;
 				}
 			} else {
@@ -294,7 +294,7 @@ void php_import_environment_variables(ELS_D PLS_DC)
 		ALLOC_ZVAL(array_ptr);
 		array_init(array_ptr);
 		INIT_PZVAL(array_ptr);
-		zend_hash_add(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &array_ptr, sizeof(pval *),NULL);
+		zend_hash_add_ptr(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), array_ptr, sizeof(pval *),NULL);
 	}
 
 	for (env = environ; env != NULL && *env != NULL; env++) {
-- 
2.50.1