From 0ebb904bbb3be4bdfd7511dc369a625fe72e79c4 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Sun, 3 Feb 2008 17:49:46 +0000
Subject: - Small improvements, no malloc needed for the zval

---
 sapi/cli/php_cli.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'sapi/cli/php_cli.c')

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index f1435340f1..806cc214c2 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -366,20 +366,16 @@ static int php_cli_startup(sapi_module_struct *sapi_module) /* {{{ */
 
 /* overwriteable ini defaults must be set in sapi_cli_ini_defaults() */
 #define INI_DEFAULT(name,value)\
-	ZVAL_STRING(tmp, value, 0);\
-	zend_hash_update(configuration_hash, name, sizeof(name), tmp, sizeof(zval), (void**)&entry);\
-	Z_STRVAL_P(entry) = zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry))
+	Z_SET_REFCOUNT(tmp, 0);\
+	Z_UNSET_ISREF(tmp);	\
+	ZVAL_STRINGL(&tmp, zend_strndup(value, sizeof(value)-1), sizeof(value)-1, 0);\
+	zend_hash_update(configuration_hash, name, sizeof(name), &tmp, sizeof(zval), NULL);\
 
 static void sapi_cli_ini_defaults(HashTable *configuration_hash)
 {
-	zval *tmp, *entry;
-	
-	MAKE_STD_ZVAL(tmp);
-
+	zval tmp;
 	INI_DEFAULT("report_zend_debug", "0");
 	INI_DEFAULT("display_errors", "1");
-
-	FREE_ZVAL(tmp);
 }
 /* }}} */
 
-- 
cgit v1.2.1