sniper Mon Dec 5 20:05:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c php_variables.h
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.8&r2=1.640.2.9&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.8 php-src/main/main.c:1.640.2.9
--- php-src/main/main.c:1.640.2.8 Thu Nov 24 19:02:11 2005
+++ php-src/main/main.c Mon Dec 5 20:05:55 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.8 2005/11/25 00:02:11 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.9 2005/12/06 01:05:55 sniper Exp $ */
/* {{{ includes
*/
@@ -566,7 +566,7 @@
zval *tmp;
ALLOC_INIT_ZVAL(tmp);
ZVAL_STRINGL(tmp, buffer, buffer_len, 1);
- zend_hash_update(EG(active_symbol_table), "php_errormsg",
sizeof("php_errormsg"), (void **) &tmp, sizeof(pval *), NULL);
+ zend_hash_update(EG(active_symbol_table), "php_errormsg",
sizeof("php_errormsg"), (void **) &tmp, sizeof(zval *), NULL);
}
efree(buffer);
}
@@ -818,14 +818,14 @@
return;
}
if (PG(track_errors) && module_initialized && EG(active_symbol_table)) {
- pval *tmp;
+ zval *tmp;
ALLOC_ZVAL(tmp);
INIT_PZVAL(tmp);
Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
Z_STRLEN_P(tmp) = buffer_len;
Z_TYPE_P(tmp) = IS_STRING;
- zend_hash_update(EG(active_symbol_table), "php_errormsg",
sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
+ zend_hash_update(EG(active_symbol_table), "php_errormsg",
sizeof("php_errormsg"), (void **) & tmp, sizeof(zval *), NULL);
}
efree(buffer);
}
http://cvs.php.net/diff.php/php-src/main/php_variables.h?r1=1.22&r2=1.22.2.1&ty=u
Index: php-src/main/php_variables.h
diff -u php-src/main/php_variables.h:1.22 php-src/main/php_variables.h:1.22.2.1
--- php-src/main/php_variables.h:1.22 Wed Aug 3 10:08:38 2005
+++ php-src/main/php_variables.h Mon Dec 5 20:05:56 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.h,v 1.22 2005/08/03 14:08:38 sniper Exp $ */
+/* $Id: php_variables.h,v 1.22.2.1 2005/12/06 01:05:56 sniper Exp $ */
#ifndef PHP_VARIABLES_H
#define PHP_VARIABLES_H
@@ -34,10 +34,10 @@
void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
void php_startup_auto_globals(TSRMLS_D);
extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr
TSRMLS_DC);
-PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array
TSRMLS_DC);
+PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array
TSRMLS_DC);
/* binary-safe version */
-PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval
*track_vars_array TSRMLS_DC);
-PHPAPI void php_register_variable_ex(char *var, zval *val, pval
*track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval
*track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable_ex(char *var, zval *val, zval
*track_vars_array TSRMLS_DC);
int php_hash_environment(TSRMLS_D);
END_EXTERN_C()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
