diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 4047973b5d..aead8e3e6c 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1084,11 +1084,6 @@ nm_utils_ip4_netmask_to_prefix (guint32 netmask) v <<= 1; } - /* Assert that caller provided a valid netmask, without "holes" and all the - * first @prefix bits set. - **/ - g_return_val_if_fail (netmask == nm_utils_ip4_prefix_to_netmask (prefix), prefix); - return prefix; } diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 79206695c5..097e238fa6 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -1780,16 +1780,11 @@ test_ip4_netmask_to_prefix (void) if (netmask_holey == netmask) continue; - (void) prefix_holey; -#if GLIB_CHECK_VERSION(2,34,0) /* create an invalid netmask with holes and check that the function * returns the longest prefix and logs an assert. */ - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "nm_utils_ip4_netmask_to_prefix: assertion 'netmask == nm_utils_ip4_prefix_to_netmask (prefix)' failed"); prefix_holey = nm_utils_ip4_netmask_to_prefix (netmask_holey); - g_test_assert_expected_messages (); g_assert_cmpint (i, ==, prefix_holey); -#endif } }