Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

src/end.c

@@ -550,6 +550,8 @@ fixup_death(int how)
 #define NOTIFY_NETHACK_BUGS
 #endif
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 /*VARARGS1*/
 void panic
 VA_DECL(const char *, str)
@@ -630,6 +632,8 @@ VA_DECL(const char *, str)
     really_done(PANICKED);
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 static boolean
 should_query_disclose_option(int category, char *defquery)
 {

src/hacklib.c

@@ -1257,6 +1257,8 @@ shuffle_int_array(int *indices, int count)
     }
 }
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 /*
  * Wrap snprintf for use in the main code.
  *
@@ -1292,4 +1294,6 @@ nh_snprintf(const char *func, int line, char *str, size_t size,
     }
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 /*hacklib.c*/

src/pline.c

@@ -80,6 +80,8 @@ putmesg(const char *line)
 
 static void vpline(const char *, va_list);
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 void
 pline(const char *line, ...)
 {
@@ -199,6 +201,8 @@ pline_done:
     --in_pline;
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 /* pline() variant which can override MSGTYPE handling or suppress
    message history (tty interface uses pline() to issue prompts and
    they shouldn't be blockable via MSGTYPE=hide) */
@@ -390,6 +394,8 @@ raw_printf(const char *line, ...)
     va_end(the_args);
 }
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 static void
 vraw_printf(const char *line, va_list the_args)
 {
@@ -450,6 +456,8 @@ impossible(const char *s, ...)
     g.program_state.in_impossible = 0;
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 #if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__))
 static boolean use_pline_handler = TRUE;
 
@@ -496,6 +504,8 @@ execplinehandler(const char *line)
  */
 static void vconfig_error_add(const char *, va_list);
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 void
 config_error_add(const char *str, ...)
 {
@@ -528,6 +538,8 @@ vconfig_error_add(const char *str, va_list the_args)
     config_erradd(buf);
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 /* nhassert_failed is called when an nhassert's condition is false */
 void
 nhassert_failed(const char *expression, const char *filepath, int line)