sniper Mon Dec 5 20:04:42 2005 EDT
Modified files:
/php-src/main main.c php_variables.h
Log:
- nuke php3 legacy
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.653&r2=1.654&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.653 php-src/main/main.c:1.654
--- php-src/main/main.c:1.653 Thu Nov 24 19:07:57 2005
+++ php-src/main/main.c Mon Dec 5 20:04:39 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.653 2005/11/25 00:07:57 iliaa Exp $ */
+/* $Id: main.c,v 1.654 2005/12/06 01:04:39 sniper Exp $ */
/* {{{ includes
*/
@@ -679,7 +679,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);
}
@@ -935,14 +935,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.23&r2=1.24&ty=u
Index: php-src/main/php_variables.h
diff -u php-src/main/php_variables.h:1.23 php-src/main/php_variables.h:1.24
--- php-src/main/php_variables.h:1.23 Thu Aug 11 19:36:05 2005
+++ php-src/main/php_variables.h Mon Dec 5 20:04:42 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.h,v 1.23 2005/08/11 23:36:05 andrei Exp $ */
+/* $Id: php_variables.h,v 1.24 2005/12/06 01:04:42 sniper Exp $ */
#ifndef PHP_VARIABLES_H
#define PHP_VARIABLES_H
@@ -34,12 +34,12 @@
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);
PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int32_t
str_len, zval *track_vars_array TSRMLS_DC);
-PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, pval
*track_vars_array TSRMLS_DC);
+PHPAPI void php_u_register_variable_ex(UChar *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
