Skip to content

Commit

Permalink
libqtest: Inline g_assert_no_errno()
Browse files Browse the repository at this point in the history
Macro g_assert_no_errno() intrudes into GLib's namespace.  It's also
pretty pointless.  Inline.

At one call site, its redundancy is now obvious.  Delete it there.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180926122933.3858-1-armbru@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
Markus Armbruster committed Oct 10, 2018
1 parent 992159c commit 70b1105
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions tests/libqtest.c
Expand Up @@ -48,10 +48,6 @@ struct QTestState
static GHookList abrt_hooks;
static struct sigaction sigact_old;

#define g_assert_no_errno(ret) do { \
g_assert_cmpint(ret, !=, -1); \
} while (0)

static int qtest_query_target_endianness(QTestState *s);

static int init_socket(const char *socket_path)
Expand All @@ -61,7 +57,7 @@ static int init_socket(const char *socket_path)
int ret;

sock = socket(PF_UNIX, SOCK_STREAM, 0);
g_assert_no_errno(sock);
g_assert_cmpint(sock, !=, -1);

addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
Expand All @@ -70,9 +66,9 @@ static int init_socket(const char *socket_path)
do {
ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
} while (ret == -1 && errno == EINTR);
g_assert_no_errno(ret);
g_assert_cmpint(ret, !=, -1);
ret = listen(sock, 1);
g_assert_no_errno(ret);
g_assert_cmpint(ret, !=, -1);

return sock;
}
Expand Down Expand Up @@ -325,7 +321,6 @@ static void socket_send(int fd, const char *buf, size_t size)
continue;
}

g_assert_no_errno(len);
g_assert_cmpint(len, >, 0);

offset += len;
Expand Down

0 comments on commit 70b1105

Please sign in to comment.