cvs: php4 /main main.c

helly Mon Mar 31 14:14:18 2003 EDT Modified files: /php4/main main.c Log: use the correct macro - noticed by Andrei Index: php4/main/main.c diff -u php4/main/main.c:1.545 php4/main/main.c:1.546 --- php4/main/main.c:1.545 Sun Mar 30 08:59:05 2003 +++ php4/main/main.c Mon Mar 31 14:14:18 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.545 2003/03/30 13:59:05 helly Exp $ */ +/* $Id: main.c,v 1.546 2003/03/31 19:14:18 helly Exp $ */ /* {{{ includes */ @@ -575,8 +575,6 @@ /* {{{ php_error_cb extended error handling function */ -#define NO_NULL_STR(x) (x?x:"") - static void php_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) { char *buffer; @@ -653,7 +651,7 @@ char *error_format = PG(html_errors) ? "%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s" : "%s\n%s: %s in %s on line %d\n%s"; - php_printf(error_format, NO_NULL_STR(prepend_string), error_type_str, buffer, error_filename, error_lineno, NO_NULL_STR(append_string)); + php_printf(error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } } #if ZEND_DEBUG