cvs: php4 /ext/standard basic_functions.c /ext/zlib zlib.c

sniper Tue Sep 3 18:54:02 2002 EDT Modified files: /php4/ext/standard basic_functions.c /php4/ext/zlib zlib.c Log: Use zend_ini_string instead of the 'alias'. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.499 php4/ext/standard/basic_functions.c:1.500 --- php4/ext/standard/basic_functions.c:1.499 Mon Aug 26 19:16:51 2002 +++ php4/ext/standard/basic_functions.c Tue Sep 3 18:54:02 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.499 2002/08/26 23:16:51 helly Exp $ */ +/* $Id: basic_functions.c,v 1.500 2002/09/03 22:54:02 sniper Exp $ */ #include "php.h" #include "php_streams.h" @@ -1983,7 +1983,7 @@ convert_to_string_ex(varname); - str = php_ini_string(Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, 0); + str = zend_ini_string(Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, 0); if (!str) { RETURN_FALSE; @@ -2080,7 +2080,7 @@ convert_to_string_ex(varname); convert_to_string_ex(new_value); - old_value = php_ini_string(Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, 0); + old_value = zend_ini_string(Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, 0); /* copy to return here, because alter might free it! */ if (old_value) { Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.148 php4/ext/zlib/zlib.c:1.149 --- php4/ext/zlib/zlib.c:1.148 Fri Aug 23 04:37:34 2002 +++ php4/ext/zlib/zlib.c Tue Sep 3 18:54:02 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.148 2002/08/23 08:37:34 zeev Exp $ */ +/* $Id: zlib.c,v 1.149 2002/09/03 22:54:02 sniper Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -135,7 +135,7 @@ { char *ini_value; - ini_value = php_ini_string("output_handler", sizeof("output_handler"), 0); + ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0); if (ini_value != NULL && strlen(ini_value) != 0 && new_value != NULL && strlen(new_value) != 0 ) { php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!");