From 1e5977b62f896e844b548c3007ace9e1dfa7f9ed Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 11 Apr 2020 21:28:04 +0200
Subject: New upstream version 1.23.90

---
 src/devices/tests/meson.build | 2 ++
 src/devices/tests/test-acd.c  | 2 +-
 src/devices/tests/test-lldp.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/devices/tests')

diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build
index bb53d1ee..1ddd4f85 100644
--- a/src/devices/tests/meson.build
+++ b/src/devices/tests/meson.build
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+
 test_units = [
   'test-acd',
   'test-lldp',
diff --git a/src/devices/tests/test-acd.c b/src/devices/tests/test-acd.c
index da5e4f2d..32d6f669 100644
--- a/src/devices/tests/test-acd.c
+++ b/src/devices/tests/test-acd.c
@@ -157,7 +157,7 @@ again:
 		}
 
 		g_error ("expected check for address #%d (%s) to %s, but it didn't",
-		         i, nm_utils_inet4_ntop (info->addresses[i], sbuf),
+		         i, _nm_utils_inet4_ntop (info->addresses[i], sbuf),
 		         info->expected_result[i] ? "detect no duplicated" : "detect a duplicate");
 	}
 }
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index bd71c9e3..8fc4ad67 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -501,7 +501,7 @@ test_recv (TestRecvFixture *fixture, gconstpointer user_data)
 	data->check (loop, listener);
 
 	nm_clear_g_source (&sd_id);
-	g_clear_pointer (&loop, g_main_loop_unref);
+	nm_clear_pointer (&loop, g_main_loop_unref);
 }
 
 static void
-- 
cgit 1.3.0-6-gf8a5