diff options
| author | Marcus Boerger <helly@php.net> | 2003-03-31 19:14:18 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-03-31 19:14:18 +0000 |
| commit | 0235d331b76746c3803a14d89954931ae622b296 (patch) | |
| tree | 18e3e290ad408f385009f94dd0938d3ed03a6dc5 | |
| parent | 64bd1cdbd63bb9487263e5eb7c0426eb86a80468 (diff) | |
| download | php-git-0235d331b76746c3803a14d89954931ae622b296.tar.gz | |
use the correct macro - noticed by Andrei
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 710761306a..2b0ff36e15 100644 --- a/main/main.c +++ b/main/main.c @@ -575,8 +575,6 @@ PHPAPI void php_html_puts(const char *str, uint size TSRMLS_DC) /* {{{ 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 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ 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 |