selftests: ncdevmem: Unify error handling
authorStanislav Fomichev <sdf@fomichev.me>
Thu, 7 Nov 2024 18:12:02 +0000 (10:12 -0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 12 Nov 2024 01:01:03 +0000 (17:01 -0800)
There is a bunch of places where error() calls look out of place.
Use the same error(1, errno, ...) pattern everywhere.

Reviewed-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20241107181211.3934153-4-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/ncdevmem.c

index 3e7ef2eedd60b45d720c8c8c443c162f619ca0f8..4733d1a0aab5de7701a390f56fd79c726e8f240f 100644 (file)
@@ -339,33 +339,33 @@ int do_server(struct memory_buffer *mem)
        server_sin.sin_port = htons(atoi(port));
 
        ret = inet_pton(server_sin.sin_family, server_ip, &server_sin.sin_addr);
-       if (socket < 0)
-               error(79, 0, "%s: [FAIL, create socket]\n", TEST_PREFIX);
+       if (ret < 0)
+               error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX);
 
        socket_fd = socket(server_sin.sin_family, SOCK_STREAM, 0);
-       if (socket < 0)
-               error(errno, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX);
+       if (socket_fd < 0)
+               error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX);
 
        ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEPORT, &opt,
                         sizeof(opt));
        if (ret)
-               error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX);
+               error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX);
 
        ret = setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &opt,
                         sizeof(opt));
        if (ret)
-               error(errno, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX);
+               error(1, errno, "%s: [FAIL, set sock opt]\n", TEST_PREFIX);
 
        fprintf(stderr, "binding to address %s:%d\n", server_ip,
                ntohs(server_sin.sin_port));
 
        ret = bind(socket_fd, &server_sin, sizeof(server_sin));
        if (ret)
-               error(errno, errno, "%s: [FAIL, bind]\n", TEST_PREFIX);
+               error(1, errno, "%s: [FAIL, bind]\n", TEST_PREFIX);
 
        ret = listen(socket_fd, 1);
        if (ret)
-               error(errno, errno, "%s: [FAIL, listen]\n", TEST_PREFIX);
+               error(1, errno, "%s: [FAIL, listen]\n", TEST_PREFIX);
 
        client_addr_len = sizeof(client_addr);