From c39859d240b9a8d5da34be8bee40f7bd972b5d84 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 24 Aug 2021 18:12:27 +0200
Subject: [PATCH] libnm/tests: replace NM_PRAGMA_WARNING_DISABLE() by
 _nm_unused

---
 src/libnm-client-impl/tests/test-nm-client.c |  2 +-
 src/libnm-client-test/nm-test-libnm-utils.h  | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/libnm-client-impl/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c
index c1e3793af9..a3fc5847e3 100644
--- a/src/libnm-client-impl/tests/test-nm-client.c
+++ b/src/libnm-client-impl/tests/test-nm-client.c
@@ -948,7 +948,7 @@ _test_connection_invalid_find_connections(gpointer element, gpointer needle, gpo
 static void
 test_connection_invalid(void)
 {
-    NMTSTC_SERVICE_INFO_SETUP(my_sinfo)
+    NMTSTC_SERVICE_INFO_SETUP(my_sinfo);
     gs_unref_object NMConnection *connection = NULL;
     NMSettingConnection *         s_con;
     gs_unref_object NMClient *client = NULL;
diff --git a/src/libnm-client-test/nm-test-libnm-utils.h b/src/libnm-client-test/nm-test-libnm-utils.h
index 58909304d0..4997ab33a5 100644
--- a/src/libnm-client-test/nm-test-libnm-utils.h
+++ b/src/libnm-client-test/nm-test-libnm-utils.h
@@ -28,17 +28,15 @@ _nmtstc_auto_service_cleanup(NMTstcServiceInfo **info)
 }
 #define nmtstc_auto_service_cleanup nm_auto(_nmtstc_auto_service_cleanup)
 
-#define NMTSTC_SERVICE_INFO_SETUP(sinfo)                      \
-    NM_PRAGMA_WARNING_DISABLE("-Wunused-variable")            \
-    nmtstc_auto_service_cleanup NMTstcServiceInfo *sinfo = ({ \
-        NMTstcServiceInfo *_sinfo;                            \
-                                                              \
-        _sinfo = nmtstc_service_init();                       \
-        if (!nmtstc_service_available(_sinfo))                \
-            return;                                           \
-        _sinfo;                                               \
-    });                                                       \
-    NM_PRAGMA_WARNING_REENABLE
+#define NMTSTC_SERVICE_INFO_SETUP(sinfo)                                 \
+    _nm_unused nmtstc_auto_service_cleanup NMTstcServiceInfo *sinfo = ({ \
+        NMTstcServiceInfo *_sinfo;                                       \
+                                                                         \
+        _sinfo = nmtstc_service_init();                                  \
+        if (!nmtstc_service_available(_sinfo))                           \
+            return;                                                      \
+        _sinfo;                                                          \
+    })
 
 NMDevice *nmtstc_service_add_device(NMTstcServiceInfo *info,
                                     NMClient *         client,