From: PatR <rankin@nethack.org>
Date: Sat, 18 Nov 2017 07:38:28 +0000 (-0800)
Subject: impossible fixup
X-Git-Tag: NetHack-3.6.1_RC01~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9153a22efbf97ea820113a0d93fb5afa6e6bca4;p=nethack

impossible fixup

For USE_OLDARGS, the varargs calls in pline.c actually need to pass a
fixed number of arguments (padded with dummies for unused ones) when
using a compiler which checks argument usage for consistency.

pline.c used to be the only core source file which needs VA_PASSx()
handling, but it looks like calls to config_error_add() in files.c now
need it too.  (If there were any calls to panic() in end.c, they would
need it as well, but there aren't.)
---

diff --git a/src/pline.c b/src/pline.c
index b35a29f18..d6ee70266 100644
--- a/src/pline.c
+++ b/src/pline.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	pline.c	$NHDT-Date: 1501803108 2017/08/03 23:31:48 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.61 $ */
+/* NetHack 3.6	pline.c	$NHDT-Date: 1510990667 2017/11/18 07:37:47 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.64 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -436,8 +436,8 @@ VA_DECL(const char *, s)
     pbuf[BUFSZ - 1] = '\0'; /* sanity */
     paniclog("impossible", pbuf);
     pline("%s", VA_PASS1(pbuf));
-    pline(
-        "Program in disorder!  (Saving and reloading may fix this problem.)");
+    pline(VA_PASS1(
+       "Program in disorder!  (Saving and reloading may fix this problem.)"));
     program_state.in_impossible = 0;
     VA_END();
 }