macro: add nice macro for disabling -Wnonnull temporarily

diff --git a/src/shared/macro.h b/src/shared/macro.h
index 458e0ebed30bf6566bb1aac223d89f5c5cb42b9c..5fd67c7abacde424a529e390d4ccff91f2ab5a39 100644 (file)
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -59,6 +59,10 @@
         _Pragma("GCC diagnostic push");                                 \
         _Pragma("GCC diagnostic ignored \"-Wmissing-prototypes\"")
 
+#define DISABLE_WARNING_NONNULL                                         \
+        _Pragma("GCC diagnostic push");                                 \
+        _Pragma("GCC diagnostic ignored \"-Wnonnull\"")
+
 #define REENABLE_WARNING                                                \
         _Pragma("GCC diagnostic pop")
 

diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index a8d5b65e6d8249b6fb6197ec060789ddfa769d30..63a8a7d076a397b98213a28c62ec2583e46c0947 100644 (file)
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -295,9 +295,6 @@ static void test_load_env_file_4(void) {
 }
 
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
-
 static void test_install_printf(void) {
         char    name[] = "name.service",
                 path[] = "/run/systemd/system/name.service",
@@ -343,7 +340,11 @@ static void test_install_printf(void) {
         expect(i, "%p", "name");
         expect(i, "%i", "");
         expect(i, "%u", "xxxx-no-such-user");
+
+        DISABLE_WARNING_NONNULL;
         expect(i, "%U", NULL);
+        REENABLE_WARNING;
+
         expect(i, "%m", mid);
         expect(i, "%b", bid);
         expect(i, "%H", host);
@@ -355,7 +356,11 @@ static void test_install_printf(void) {
         expect(i3, "%N", "name@inst");
         expect(i3, "%p", "name");
         expect(i3, "%u", "xxxx-no-such-user");
+
+        DISABLE_WARNING_NONNULL;
         expect(i3, "%U", NULL);
+        REENABLE_WARNING;
+
         expect(i3, "%m", mid);
         expect(i3, "%b", bid);
         expect(i3, "%H", host);
@@ -363,7 +368,6 @@ static void test_install_printf(void) {
         expect(i4, "%u", "root");
         expect(i4, "%U", "0");
 }
-#pragma GCC diagnostic pop
 
 int main(int argc, char *argv[]) {
         int r;