Changeset 3da12d74 in mainline for uspace/app/nettest1/nettest.c

Timestamp:

2010-11-07T13:41:35Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9ce7eb5, 9fd39d6, b40bfac

Parents:

1712f87 (diff), 69e0d6d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from my dev/netcleanup. Remove use of ERROR_… macros from app/net* and some cstyle cleanup.

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>
 
@@ -87 +85 @@
 int sockets_close(int verbose, int *socket_ids, int sockets)
 {
-        ERROR_DECLARE;
-
-        int index;
+        int index;
+        int rc;
 
         if (verbose)
@@ -97 +94 @@
         
         for (index = 0; index < sockets; index++) {
-                if (ERROR_OCCURRED(closesocket(socket_ids[index]))) {
+                rc = closesocket(socket_ids[index]);
+                if (rc != EOK) {
                         printf("Socket %d (%d) error:\n", index, socket_ids[index]);
-                        socket_print_error(stderr, ERROR_CODE, "Socket close: ", "\n");
-                        return ERROR_CODE;
+                        socket_print_error(stderr, rc, "Socket close: ", "\n");
+                        return rc;
                 }
                 if (verbose)
@@ -121 +119 @@
 int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
 {
-        ERROR_DECLARE;
-
-        int index;
+        int index;
+        int rc;
 
         if (verbose)
@@ -131 +128 @@
         
         for (index = 0; index < sockets; index++) {
-                if (ERROR_OCCURRED(connect(socket_ids[index], address, addrlen))) {
-                        socket_print_error(stderr, ERROR_CODE, "Socket connect: ", "\n");
-                        return ERROR_CODE;
+                rc = connect(socket_ids[index], address, addrlen);
+                if (rc != EOK) {
+                        socket_print_error(stderr, rc, "Socket connect: ", "\n");
+                        return rc;
                 }
                 if (verbose)
@@ -157 +155 @@
 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)
@@ -169 +166 @@
         for (index = 0; index < sockets; index++) {
                 for (message = 0; message < messages; message++) {
-                        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;
+                        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;
                         }
                 }
@@ -239 +237 @@
 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)
@@ -252 +249 @@
         for (index = 0; index < sockets; index++) {
                 for (message = 0; message < messages; message++) {
-                        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;
+                        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;
                         }
                         value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);