helly Sun Feb 3 17:49:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
- Small improvements, no malloc needed for the zval
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.3&r2=1.129.2.13.2.22.2.4&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.3
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.4
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.3 Tue Jan 29 20:01:31 2008
+++ php-src/sapi/cli/php_cli.c Sun Feb 3 17:49:46 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.3 2008/01/29 20:01:31 dmitry Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.4 2008/02/03 17:49:46 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -366,20 +366,16 @@
/* 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);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
