cvs: php4 /main main.c

sas Tue Aug 15 10:05:37 2000 EDT Modified files: /php4/main main.c Log: Fix varargs handling. The assignments are not necessary at all and cause problems on various platforms, so we get rid of them. Index: php4/main/main.c diff -u php4/main/main.c:1.292 php4/main/main.c:1.293 --- php4/main/main.c:1.292 Tue Aug 15 09:46:43 2000 +++ php4/main/main.c Tue Aug 15 10:05:37 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.292 2000/08/15 16:46:43 zeev Exp $ */ +/* $Id: main.c,v 1.293 2000/08/15 17:05:37 sas Exp $ */ #include <stdio.h> @@ -330,7 +330,6 @@ { char buffer[1024]; int size = 0; - va_list args; ELS_FETCH(); PLS_FETCH(); @@ -366,9 +365,9 @@ /* get include file name */ if (PG(log_errors) || PG(display_errors) || (!module_initialized)) { - args = orig_args; - size = vsnprintf(buffer, sizeof(buffer) - 1, format, args); - va_end(args); + size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args); + va_end(orig_args); + buffer[sizeof(buffer) - 1] = 0; if (!module_initialized || PG(log_errors)) { @@ -442,9 +441,8 @@ if (PG(track_errors) && EG(active_symbol_table)) { pval *tmp; - args = orig_args; - size = vsnprintf(buffer, sizeof(buffer) - 1, format, args); - va_end(args); + size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args); + va_end(orig_args); buffer[sizeof(buffer) - 1] = 0;