diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-16 16:42:46 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
| commit | 21c8a6b20effbe1e689505a0cbb23594be06068c (patch) | |
| tree | 15e43867853d0242950e40e049499e1c2d29cc78 /include | |
| parent | 303e84e65e5b9b5a403e4f8366e094447d51a9fa (diff) | |
| download | NetworkManager-21c8a6b20effbe1e689505a0cbb23594be06068c.tar.gz | |
libnm-core, all: merge IPv4 and IPv6 address/route types
Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route
and NMIP6Route into NMIPRoute. The new types represent IP addresses as
strings, rather than in binary, and so are address-family agnostic.
Diffstat (limited to 'include')
| -rw-r--r-- | include/nm-test-utils.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 11ffd33033..ca6d97d598 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -952,18 +952,6 @@ nmtst_assert_connection_unnormalizable (NMConnection *con, #endif -static inline void -nmtst_assert_ip4_address_equals (guint32 addr, const char *expected, const char *loc) -{ - guint32 addr2 = nmtst_inet4_from_string (expected); - - if (addr != addr2) - g_error ("assert: %s: ip4 address '%s' expected, but got %s", - loc, expected ? expected : "any", nm_utils_inet4_ntop (addr, NULL)); -} -#define nmtst_assert_ip4_address_equals(addr, expected) \ - nmtst_assert_ip4_address_equals (addr, expected, G_STRLOC) - #ifdef __NM_UTILS_H__ static inline void nmtst_assert_hwaddr_equals (gconstpointer hwaddr1, gssize hwaddr1_len, const char *expected, const char *loc) |