From: nhmall <nhmall@nethack.org>
Date: Wed, 3 Feb 2021 00:50:07 +0000 (-0500)
Subject: whitelist some macOS clang format-nonliteral warnings
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9684b75f5476835ad6f1a41727c70e05fa88c796;p=nethack

whitelist some macOS clang format-nonliteral warnings
---

diff --git a/src/end.c b/src/end.c
index b71f0fb6a..4005e459d 100644
--- a/src/end.c
+++ b/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)
 {
diff --git a/src/hacklib.c b/src/hacklib.c
index 12c2006a6..027f18cf1 100644
--- a/src/hacklib.c
+++ b/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*/
diff --git a/src/pline.c b/src/pline.c
index 2ce20d624..cfd2b94e1 100644
--- a/src/pline.c
+++ b/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)
diff --git a/sys/share/unixtty.c b/sys/share/unixtty.c
index dd5f5682a..d731e1038 100644
--- a/sys/share/unixtty.c
+++ b/sys/share/unixtty.c
@@ -462,6 +462,8 @@ init_linux_cons(void)
 }
 #endif /* __linux__ */
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 #ifndef __begui__ /* the Be GUI will define its own error proc */
 /* fatal error */
 void
@@ -480,3 +482,6 @@ error(const char *s, ...)
     exit(EXIT_FAILURE);
 }
 #endif /* !__begui__ */
+
+RESTORE_WARNING_FORMAT_NONLITERAL
+