jani            Mon Oct  1 12:26:56 2007 UTC

  Modified files:              
    /php-src/main       php_ini.c 
  Log:
  - Fix warning
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.158&r2=1.159&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.158 php-src/main/php_ini.c:1.159
--- php-src/main/php_ini.c:1.158        Fri Sep 28 10:23:14 2007
+++ php-src/main/php_ini.c      Mon Oct  1 12:26:55 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ini.c,v 1.158 2007/09/28 10:23:14 jani Exp $ */
+/* $Id: php_ini.c,v 1.159 2007/10/01 12:26:55 jani Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -721,7 +721,7 @@
  */
 PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, 
int stage TSRMLS_DC)
 {
-       char *str;
+       zstr str;
        zval *data;
        uint str_len;
        ulong num_index;
@@ -732,7 +732,7 @@
                zend_hash_move_forward(source_hash)
        ) {
                zend_hash_get_current_data(source_hash, (void **) &data);
-               zend_alter_ini_entry_ex(str, str_len, Z_STRVAL_P(data), 
Z_STRLEN_P(data), modify_type, stage, 0 TSRMLS_CC);
+               zend_alter_ini_entry_ex(str.s, str_len, Z_STRVAL_P(data), 
Z_STRLEN_P(data), modify_type, stage, 0 TSRMLS_CC);
        }
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to