cleanup

diff --git a/main/main.c b/main/main.c
index c77c2e13c1cf4ef27d68693b7707b425701d2335..710761306ab2993a0377ad5c6c1e9af37268aa7f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -575,6 +575,8 @@ 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;
@@ -642,28 +644,16 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                }
                if (module_initialized && PG(display_errors)
                        && (!PG(during_request_startup) || PG(display_startup_errors))) {
-                       char *prepend_string = INI_STR("error_prepend_string");
-                       char *append_string = INI_STR("error_append_string");
-                       char *error_format;
-
-                       error_format = PG(html_errors) ?
-                               "<br />\n<b>%s</b>:  %s in <b>%s</b> on line <b>%d</b><br />\n"
-                               : "\n%s: %s in %s on line %d\n";
-                       if (PG(xmlrpc_errors)) {
-                               error_format = do_alloca(ERROR_BUF_LEN);
-                               snprintf(error_format, ERROR_BUF_LEN-1, "<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%%s:%%s in %%s on line %%d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number));
-                       }
 
-                       if (prepend_string) {
-                               PUTS(prepend_string);
-                       }
-                       php_printf(error_format, error_type_str, buffer, error_filename, error_lineno);
                        if (PG(xmlrpc_errors)) {
-                               free_alloca(error_format);
-                       }
-
-                       if (append_string) {
-                               PUTS(append_string);
+                               php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
+                       } else {
+                               char *prepend_string = INI_STR("error_prepend_string");
+                               char *append_string = INI_STR("error_append_string");
+                               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));
                        }
                }
 #if ZEND_DEBUG