From 7514efc2f38c9ace4557d4e69d68e7d380389030 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Aug 2016 02:18:32 +0200 Subject: Imported Upstream version 1.4.0 --- src/main-utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main-utils.c') diff --git a/src/main-utils.c b/src/main-utils.c index 86242802..c2ed9d1c 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -31,7 +31,6 @@ #include #include -#include #include "main-utils.h" #include "NetworkManagerUtils.h" @@ -243,6 +242,7 @@ nm_main_utils_early_setup (const char *progname, textdomain (GETTEXT_PACKAGE); for (i = 0; options[i].long_name; i++) { + NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral") if (!strcmp (options[i].long_name, "log-level")) { opt_fmt_log_level = options[i].description; opt_loc_log_level = &options[i].description; @@ -252,6 +252,7 @@ nm_main_utils_early_setup (const char *progname, opt_loc_log_domains = &options[i].description; options[i].description = g_strdup_printf (options[i].description, nm_logging_all_domains_to_string ()); } + NM_PRAGMA_WARNING_REENABLE } /* Parse options */ -- cgit 1.3.0-6-gf8a5