Fixes for compilation with gcc 15

[micropolis] / src / tcl / panic.c

diff --git a/src/tcl/panic.c b/src/tcl/panic.c
index abd515a2f6a8041af6f91ee93c434c8e307ebc37..eb8cddc6bb1e30e696cc055fa2c589609340a3d4 100644 (file)
--- a/src/tcl/panic.c
+++ b/src/tcl/panic.c
@@ -21,6 +21,7 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/panic.c,v 1.3 91/10/10 11:
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <stdarg.h>

 \f
 /*
  *----------------------------------------------------------------------
 \f
 /*
  *----------------------------------------------------------------------


@@ -40,15 +41,40 @@ static char rcsid[] = "$Header: /user6/ouster/tcl/RCS/panic.c,v 1.3 91/10/10 11:
 
        /* VARARGS ARGSUSED */
 void
 
        /* VARARGS ARGSUSED */
 void

-panic(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
-    char *format;              /* Format string, suitable for passing to
+panicVA(
+    char *format,              /* Format string, suitable for passing to

                                 * fprintf. */
                                 * fprintf. */

+    va_list argList            /* Variable argument list. */
+)
+{

     char *arg1, *arg2, *arg3;  /* Additional arguments (variable in number)
                                 * to pass to fprintf. */
     char *arg4, *arg5, *arg6, *arg7, *arg8;
     char *arg1, *arg2, *arg3;  /* Additional arguments (variable in number)
                                 * to pass to fprintf. */
     char *arg4, *arg5, *arg6, *arg7, *arg8;

-{
+
+    arg1 = va_arg(argList, char *);
+    arg2 = va_arg(argList, char *);
+    arg3 = va_arg(argList, char *);
+    arg4 = va_arg(argList, char *);
+    arg5 = va_arg(argList, char *);
+    arg6 = va_arg(argList, char *);
+    arg7 = va_arg(argList, char *);
+    arg8 = va_arg(argList, char *);
+

     (void) fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6,
            arg7, arg8);
     (void) fflush(stderr);
     abort();
 }
     (void) fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6,
            arg7, arg8);
     (void) fflush(stderr);
     abort();
 }

+
+void
+panic(
+    char *format,              /* Format string, suitable for passing to
+                                * fprintf. */
+    ...
+)
+{
+    va_list argList;
+
+    va_start(argList, format);
+    panicVA(format, argList);
+}