cvs: /php4 main.c
| From: | Andrei Zmievski | Date: | Tue, 19 Oct 1999 19:11:33 +0000 |
| Subject: | cvs: /php4 main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-5586@lists.php.net to get a copy of this message | ||
andrei Tue Oct 19 15:11:33 1999 EDT
Modified files:
/php4 main.c
Log:
Revert my patches to error functions.
Index: php4/main.c
diff -u php4/main.c:1.132 php4/main.c:1.133
--- php4/main.c:1.132 Fri Oct 15 16:32:47 1999
+++ php4/main.c Tue Oct 19 15:11:02 1999
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.132 1999/10/15 20:32:47 andrei Exp $ */
+/* $Id: main.c,v 1.133 1999/10/19 19:11:02 andrei Exp $ */
#include <stdio.h>
@@ -81,11 +81,6 @@
#include "php_getopt.h"
#endif
-#if CGI_BINARY
-#define PHP_ERROR_FORMAT "PHP %s: %s in %s on line %d"
-#else
-#define PHP_ERROR_FORMAT "<br>\n<b>PHP %s</b>: %s in <b>%s</b>
on line <b>%d</b><br>"
-#endif
#ifndef ZTS
php_core_globals core_globals;
@@ -333,14 +328,12 @@
}
#endif /*APACHE */
-#if 0
#if CGI_BINARY
if (php3_header()) {
fprintf(stderr, log_message);
fprintf(stderr, "\n");
}
#endif
-#endif
}
@@ -450,7 +443,7 @@
if (PG(log_errors)) {
char log_buffer[1024];
- snprintf(log_buffer, 1024, PHP_ERROR_FORMAT, error_type_str, buffer, error_filename,
error_lineno);
+ snprintf(log_buffer, 1024, "PHP %s: %s in %s on line %d", error_type_str, buffer,
error_filename, error_lineno);
php3_log_err(log_buffer);
}
if (PG(display_errors)) {
@@ -460,7 +453,7 @@
if (prepend_string) {
PUTS(prepend_string);
}
- php_printf(PHP_ERROR_FORMAT "\n", error_type_str, buffer, error_filename,
error_lineno);
+ php_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line
<b>%d</b><br>\n", error_type_str, buffer, error_filename, error_lineno);
if (append_string) {
PUTS(append_string);
}