From 1ad8d12e7fcd7d55a37099d7426e3290297ba6d3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 13 Dec 2013 11:24:00 -0800 Subject: [PATCH] Ignore a couple of format-nonliteral warnings These are generated in code which uses sprintf as a convenient way to construct strings from various pieces. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt --- hw/xfree86/os-support/linux/lnx_init.c | 1 + os/log.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index e2e8d0826..46438e655 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -155,6 +155,7 @@ xf86OpenConsole(void) i = 0; while (vcs[i] != NULL) { +#pragma GCC diagnostic ignored "-Wformat-nonliteral" snprintf(vtname, sizeof(vtname), vcs[i], xf86Info.vtno); /* /dev/tty1-64 */ if ((xf86Info.consoleFd = open(vtname, O_RDWR | O_NDELAY, 0)) >= 0) break; diff --git a/os/log.c b/os/log.c index 792b79e93..8deb81040 100644 --- a/os/log.c +++ b/os/log.c @@ -195,6 +195,7 @@ LogInit(const char *fname, const char *backup) char *logFileName = NULL; if (fname && *fname) { +#pragma GCC diagnostic ignored "-Wformat-nonliteral" if (asprintf(&logFileName, fname, display) == -1) FatalError("Cannot allocate space for the log file name\n"); @@ -205,6 +206,7 @@ LogInit(const char *fname, const char *backup) char *suffix; char *oldLog; +#pragma GCC diagnostic ignored "-Wformat-nonliteral" if ((asprintf(&suffix, backup, display) == -1) || (asprintf(&oldLog, "%s%s", logFileName, suffix) == -1)) FatalError("Cannot allocate space for the log file name\n");