Commit 8190a68c authored by Thomas Haller's avatar Thomas Haller

libnm-core/tests: fix "-Werror=logical-not-parentheses" warning in _sock_addr_endpoint()

    CC       libnm-core/tests/libnm_core_tests_test_general-test-general.o
  In file included from ../shared/nm-default.h:280:0,
                   from ../libnm-core/tests/test-general.c:24:
  ../libnm-core/tests/test-general.c: In function _sock_addr_endpoint:
  ../libnm-core/tests/test-general.c:5911:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses]
    g_assert (!host == (port == -1));
  ../shared/nm-utils/nm-macros-internal.h:1793:7: note: in definition of macro __NM_G_BOOLEAN_EXPR_IMPL
     if (expr) \
  /usr/include/glib-2.0/glib/gmacros.h:376:43: note: in expansion of macro _G_BOOLEAN_EXPR
   #define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR((expr)), 1))
  /usr/include/glib-2.0/glib/gtestutils.h:116:49: note: in expansion of macro G_LIKELY
                                                if G_LIKELY (expr) ; else \
  ../libnm-core/tests/test-general.c:5911:2: note: in expansion of macro g_assert
    g_assert (!host == (port == -1));

Fixes: 713e879d ('libnm: add NMSockAddrEndpoint API')
(cherry picked from commit 1e8c0873)
(cherry picked from commit fd8b78dd)
parent 78e1f975
Pipeline #31554 failed with stage
in 53 minutes and 19 seconds
......@@ -5540,7 +5540,7 @@ _sock_addr_endpoint (const char *endpoint,
SockAddrUnion sockaddr = { };
g_assert (endpoint);
g_assert (!host == (port == -1));
g_assert ((!host) == (port == -1));
g_assert (port >= -1 && port <= G_MAXUINT16);
ep = nm_sock_addr_endpoint_new (endpoint);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment