about summary refs log tree commit diff
path: root/src/libnm-client-test
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2022-01-13 22:34:27 +0100
committerMichael Biebl <biebl@debian.org>2022-01-13 22:34:27 +0100
commitdd97d276b5d70c3397a4e59c978ca5228f06ba44 (patch)
tree5fb3f5e0f5da28e39d3261d50561349a512ba297 /src/libnm-client-test
parent3e2f6719468f8d957ae3cb112f3cb75b9c82d6a7 (diff)
parent88c227d90a6b7b388c5c85d72802a0ca8f05ed5c (diff)
Update upstream source from tag 'upstream/1.34.0'
Update to upstream version '1.34.0'
with Debian dir b598c27ee9cef517760bc745aa6a3bb7d9fb2ecb
Diffstat (limited to 'src/libnm-client-test')
-rw-r--r--src/libnm-client-test/nm-test-libnm-utils.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/libnm-client-test/nm-test-libnm-utils.h b/src/libnm-client-test/nm-test-libnm-utils.h
index 58909304..4997ab33 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,