com php-src: pval is dead, long live zval!: main/main.c

From: Date: Thu, 12 Dec 2013 08:47:41 +0000
Subject: com php-src: pval is dead, long live zval!: main/main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76643@lists.php.net to get a copy of this message
Commit: 360a859a3b572ae76a32ef5e270c9a403fbc30c2 Author: Antony Dovgal <tony@daylessday.org> Sat, 31 Dec 2011 15:52:13 +0400 Committer: Antony Dovgal <tony2001@php.net> Thu, 12 Dec 2013 12:47:41 +0400 Parents: 65e20623b27e2b995188fa49bdf83cbc5eb44428 Branches: badoo-5..5_mysqlnd Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=360a859a3b572ae76a32ef5e270c9a403fbc30c2 Log: pval is dead, long live zval! Changed paths: M main/main.c Diff: diff --git a/main/main.c b/main/main.c index 4d78ac4..c6cb09a 100644 --- a/main/main.c +++ b/main/main.c @@ -1142,12 +1142,12 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ * registered with register_shutdown_function() * also this exports the variable even if error reporting is disabled */ -#define DECLARE_NAMED_PVAL(var) \ - pval *var; \ +#define DECLARE_NAMED_ZVAL(var) \ + zval *var; \ MAKE_STD_ZVAL(var); -#define EXPORT_GLOBAL_PVAL(var, str) \ - zend_hash_update(&EG(symbol_table), str, sizeof(str), (void **)&var, sizeof(pval*), NULL); +#define EXPORT_GLOBAL_ZVAL(var, str) \ + zend_hash_update(&EG(symbol_table), str, sizeof(str), (void **)&var, sizeof(zval*), NULL); if (display && (EG(error_reporting) & type) && PG(track_errors)) { @@ -1157,29 +1157,29 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ if (EG(active_symbol_table)) { /* export error message */ - DECLARE_NAMED_PVAL(message); + DECLARE_NAMED_ZVAL(message); ZVAL_STRINGL(message, buffer, buffer_len, 1); - EXPORT_GLOBAL_PVAL(message, "php_errormsg"); + EXPORT_GLOBAL_ZVAL(message, "php_errormsg"); /* export error type */ - DECLARE_NAMED_PVAL(error_type); + DECLARE_NAMED_ZVAL(error_type); ZVAL_LONG(error_type, type); - EXPORT_GLOBAL_PVAL(error_type, "php_error_type"); + EXPORT_GLOBAL_ZVAL(error_type, "php_error_type"); /* export filename */ - DECLARE_NAMED_PVAL(filename); + DECLARE_NAMED_ZVAL(filename); ZVAL_STRING(filename, (char *)error_filename, 1); - EXPORT_GLOBAL_PVAL(filename, "php_error_file"); + EXPORT_GLOBAL_ZVAL(filename, "php_error_file"); /* export line number */ - DECLARE_NAMED_PVAL(lineno); + DECLARE_NAMED_ZVAL(lineno); ZVAL_LONG(lineno, error_lineno); - EXPORT_GLOBAL_PVAL(lineno, "php_error_line"); + EXPORT_GLOBAL_ZVAL(lineno, "php_error_line"); } } -#undef EXPORT_GLOBAL_PVAL -#undef DECLARE_NAMED_PVAL +#undef EXPORT_GLOBAL_ZVAL +#undef DECLARE_NAMED_ZVAL /* Bail out if we can't recover */ switch (type) {

« previous php.cvs (#76643) next »