Changes in uspace/app/nettest1/nettest.c [0bbef9b:3d459fc] in mainline

File:

• uspace/app/nettest1/nettest.c (modified) (9 diffs)

uspace/app/nettest1/nettest.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <err.h>
+
 #include <net/socket.h>
 
@@ -85 +87 @@
 int sockets_close(int verbose, int *socket_ids, int sockets)
 {
-        int index;
-        int rc;
+        ERROR_DECLARE;
+
+        int index;
 
         if (verbose)
@@ -94 +97 @@
         
         for (index = 0; index < sockets; index++) {
-                rc = closesocket(socket_ids[index]);
-                if (rc != EOK) {
+                if (ERROR_OCCURRED(closesocket(socket_ids[index]))) {
                         printf("Socket %d (%d) error:\n", index, socket_ids[index]);
-                        socket_print_error(stderr, rc, "Socket close: ", "\n");
-                        return rc;
+                        socket_print_error(stderr, ERROR_CODE, "Socket close: ", "\n");
+                        return ERROR_CODE;
                 }
                 if (verbose)
@@ -119 +121 @@
 int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
 {
-        int index;
-        int rc;
+        ERROR_DECLARE;
+
+        int index;
 
         if (verbose)
@@ -128 +131 @@
         
         for (index = 0; index < sockets; index++) {
-                rc = connect(socket_ids[index], address, addrlen);
-                if (rc != EOK) {
-                        socket_print_error(stderr, rc, "Socket connect: ", "\n");
-                        return rc;
+                if (ERROR_OCCURRED(connect(socket_ids[index], address, addrlen))) {
+                        socket_print_error(stderr, ERROR_CODE, "Socket connect: ", "\n");
+                        return ERROR_CODE;
                 }
                 if (verbose)
@@ -155 +157 @@
 int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
 {
+        ERROR_DECLARE;
+
         int index;
         int message;
-        int rc;
 
         if (verbose)
@@ -166 +169 @@
         for (index = 0; index < sockets; index++) {
                 for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, addrlen);
-                        if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, rc, "Socket send: ", "\n");
-                                return rc;
+                        if (ERROR_OCCURRED(sendto(socket_ids[index], data, size, 0, address, addrlen))) {
+                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                socket_print_error(stderr, ERROR_CODE, "Socket send: ", "\n");
+                                return ERROR_CODE;
                         }
                 }
@@ -237 +239 @@
 int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
 {
+        ERROR_DECLARE;
+
         int value;
         int index;
         int message;
-        int rc;
 
         if (verbose)
@@ -249 +252 @@
         for (index = 0; index < sockets; index++) {
                 for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, *addrlen);
-                        if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, rc, "Socket send: ", "\n");
-                                return rc;
+                        if (ERROR_OCCURRED(sendto(socket_ids[index], data, size, 0, address, *addrlen))) {
+                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                socket_print_error(stderr, ERROR_CODE, "Socket send: ", "\n");
+                                return ERROR_CODE;
                         }
                         value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);