From 97a2a566b4780b05e5a00db609643a24fc92fb99 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 25 Aug 2022 19:20:58 +0200 Subject: [PATCH] glib-aux/trivial: rename function for consistency --- src/libnm-glib-aux/nm-shared-utils.h | 1 + src/libnm-glib-aux/tests/test-shared-general.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index cb3f7f9ad..892d0d301 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -274,6 +274,7 @@ gboolean nm_utils_get_ipv6_interface_identifier(NMLinkType link_type, NMUtilsIPv6IfaceId *out_iid); /*****************************************************************************/ + gboolean nm_utils_memeqzero(gconstpointer data, gsize length); /*****************************************************************************/ diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c index af4354403..e6e57c521 100644 --- a/src/libnm-glib-aux/tests/test-shared-general.c +++ b/src/libnm-glib-aux/tests/test-shared-general.c @@ -251,7 +251,7 @@ test_nm_strndup_a(void) /*****************************************************************************/ static void -test_nm_utils_ip4_address_is_loopback(void) +test_nm_ip4_addr_is_loopback(void) { g_assert(nm_ip4_addr_is_loopback(nmtst_inet4_from_string("127.0.0.0"))); g_assert(nm_ip4_addr_is_loopback(nmtst_inet4_from_string("127.0.0.1"))); @@ -264,7 +264,7 @@ test_nm_utils_ip4_address_is_loopback(void) /*****************************************************************************/ static void -test_nm_utils_ip4_prefix_to_netmask(void) +test_nm_ip4_addr_netmask_from_prefix(void) { g_assert_cmpint(nm_ip4_addr_netmask_from_prefix(0), ==, nmtst_inet4_from_string("0.0.0.0")); g_assert_cmpint(nm_ip4_addr_netmask_from_prefix(1), ==, nmtst_inet4_from_string("128.0.0.0")); @@ -2228,10 +2228,9 @@ main(int argc, char **argv) g_test_add_func("/general/test_nm_make_strv", test_make_strv); g_test_add_func("/general/test_nm_strdup_int", test_nm_strdup_int); g_test_add_func("/general/test_nm_strndup_a", test_nm_strndup_a); - g_test_add_func("/general/test_nm_utils_ip4_address_is_loopback", - test_nm_utils_ip4_address_is_loopback); - g_test_add_func("/general/test_nm_utils_ip4_prefix_to_netmask", - test_nm_utils_ip4_prefix_to_netmask); + g_test_add_func("/general/test_nm_ip4_addr_is_loopback", test_nm_ip4_addr_is_loopback); + g_test_add_func("/general/test_nm_ip4_addr_netmask_from_prefix", + test_nm_ip4_addr_netmask_from_prefix); g_test_add_func("/general/test_unaligned", test_unaligned); g_test_add_func("/general/test_strv_cmp", test_strv_cmp); g_test_add_func("/general/test_strstrip_avoid_copy", test_strstrip_avoid_copy);