tree-wide: use DISABLE_WARNING_FORMAT_NONLITERAL where appropriate

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index c6043943f16c44ac77af45b45756b9c6f11f7d12..abfab14dab0eb457bedaa469b62f2e249855a6ce 100644 (file)
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -123,12 +123,12 @@ _printf_(2, 3) static int log_callback(int type, const char *fmt, ...) {
         fmt2 = strjoina("selinux: ", fmt);
 
         va_start(ap, fmt);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         log_internalv(LOG_AUTH | callback_type_to_priority(type),
                       0, PROJECT_FILE, __LINE__, __FUNCTION__,
                       fmt2, ap);
-#pragma GCC diagnostic pop
+        REENABLE_WARNING;
         va_end(ap);
 
         return 0;

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 36a8ff23d4c3a9a48e13f83b331b5f72e844dd12..77b90e1a9b808b573d84a995167f60d186e6cee4 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -263,10 +263,10 @@ static int write_dependency(
                 res = strv_join(units, " ");
                 if (!res)
                         return log_oom();
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
+                DISABLE_WARNING_FORMAT_NONLITERAL;
                 fprintf(f, format, res);
-#pragma GCC diagnostic pop
+                REENABLE_WARNING;
         }
 
         return 0;

diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 939af12572be47d932b0a3bf88ae94ea26b2443a..027f2c8ff5802c41655d94a3aaa397c66aead8c3 100644 (file)
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -78,10 +78,9 @@ int mhd_respondf(struct MHD_Connection *connection,
         errno = -error;
         fmt = strjoina(format, "\n");
         va_start(ap, format);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         r = vasprintf(&m, fmt, ap);
-#pragma GCC diagnostic pop
+        REENABLE_WARNING;
         va_end(ap);
 
         if (r < 0)

diff --git a/src/locale/localed.c b/src/locale/localed.c
index a6aa3bae8c86c418d154a8448b1a8bd0f0c67d19..8ffcf306b5b74aec4de5593f0ea8e86d2e403e5b 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -499,10 +499,9 @@ static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char
         const char *fmt;
 
         fmt = strjoina("libxkbcommon: ", format);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         log_internalv(LOG_DEBUG, 0, __FILE__, __LINE__, __func__, fmt, args);
-#pragma GCC diagnostic pop
+        REENABLE_WARNING;
 }
 
 #define LOAD_SYMBOL(symbol, dl, name)                                   \

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 169d6ce8f7cb2e164baa6f988882cf8e74d6d098..b3c0ec827b655334572e1ac43780ba0d699e9fe1 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -449,11 +449,10 @@ static int names_platform(sd_device *dev, struct netnames *names, bool test) {
          * The Vendor (3 or 4 char), followed by hexdecimal model number : instance id.
          */
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         if (sscanf(syspath, pattern, vendor, &model, &instance, &ethid) != 4)
                 return -EINVAL;
-#pragma GCC diagnostic pop
+        REENABLE_WARNING;
 
         if (!in_charset(vendor, validchars))
                 return -ENOENT;