Changeset 5f69504 in mainline

Timestamp:

2010-11-06T23:03:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

774e9ecd

Parents:

0bbef9b

Message:

Remove use of ERROR_ macros from nettest2.

File:

• uspace/app/nettest2/nettest2.c (modified) (10 diffs)

uspace/app/nettest2/nettest2.c

@@ -44 +44 @@
 #include <time.h>
 #include <arg_parse.h>
-#include <err.h>
 
 #include <net/in.h>
@@ -111 +110 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
-
         size_t size = 28;
         int verbose = 0;
@@ -135 +132 @@
         struct timeval time_before;
         struct timeval time_after;
+
+        int rc;
 
         // parse the command line arguments
@@ -144 +143 @@
                         // short options with only one letter
                         case 'f':
-                                ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family));
+                                rc = arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family);
+                                if (rc != EOK)
+                                        return rc;
                                 break;
                         case 'h':
@@ -151 +152 @@
                                 break;
                         case 'm':
-                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0));
+                                rc = arg_parse_int(argc, argv, &index, &messages, 0);
+                                if (rc != EOK)
+                                        return rc;
                                 break;
                         case 'n':
-                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0));
+                                rc = arg_parse_int(argc, argv, &index, &sockets, 0);
+                                if (rc != EOK)
+                                        return rc;
                                 break;
                         case 'p':
-                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0));
+                                rc = arg_parse_int(argc, argv, &index, &value, 0);
+                                if (rc != EOK)
+                                        return rc;
                                 port = (uint16_t) value;
                                 break;
                         case 's':
-                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0));
+                                rc = arg_parse_int(argc, argv, &index, &value, 0);
+                                if (rc != EOK)
+                                        return rc;
                                 size = (value >= 0) ? (size_t) value : 0;
                                 break;
                         case 't':
-                                ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type));
+                                rc = arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type);
+                                if (rc != EOK)
+                                        return rc;
                                 type = (sock_type_t) value;
                                 break;
@@ -174 +185 @@
                         case '-':
                                 if (str_lcmp(argv[index] + 2, "family=", 7) == 0) {
-                                        ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family));
+                                        rc = arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family);
+                                        if (rc != EOK)
+                                                return rc;
                                 } else if (str_lcmp(argv[index] + 2, "help", 5) == 0) {
                                         nettest2_print_help();
                                         return EOK;
                                 } else if (str_lcmp(argv[index] + 2, "messages=", 6) == 0) {
-                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8));
+                                        rc = arg_parse_int(argc, argv, &index, &messages, 8);
+                                        if (rc != EOK)
+                                                return rc;
                                 } else if (str_lcmp(argv[index] + 2, "sockets=", 6) == 0) {
-                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8));
+                                        rc = arg_parse_int(argc, argv, &index, &sockets, 8);
+                                        if (rc != EOK)
+                                                return rc;
                                 } else if (str_lcmp(argv[index] + 2, "port=", 5) == 0) {
-                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7));
+                                        rc = arg_parse_int(argc, argv, &index, &value, 7);
+                                        if (rc != EOK)
+                                                return rc;
                                         port = (uint16_t) value;
                                 } else if (str_lcmp(argv[index] + 2, "type=", 5) == 0) {
-                                        ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type));
+                                        rc = arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type);
+                                        if (rc != EOK)
+                                                return rc;
                                         type = (sock_type_t) value;
                                 } else if (str_lcmp(argv[index] + 2, "verbose", 8) == 0) {
@@ -233 +254 @@
 
         // parse the last argument which should contain the address
-        if (ERROR_OCCURRED(inet_pton(family, argv[argc - 1], address_start))) {
-                fprintf(stderr, "Address parse error %d\n", ERROR_CODE);
-                return ERROR_CODE;
+        rc = inet_pton(family, argv[argc - 1], address_start);
+        if (rc != EOK) {
+                fprintf(stderr, "Address parse error %d\n", rc);
+                return rc;
         }
 
@@ -271 +293 @@
                 printf("Starting tests\n");
 
-        ERROR_PROPAGATE(sockets_create(verbose, socket_ids, sockets, family, type));
-
-        if (type == SOCK_STREAM)
-                ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, sockets, address, addrlen));
+        rc = sockets_create(verbose, socket_ids, sockets, family, type);
+        if (rc != EOK)
+                return rc;
+
+        if (type == SOCK_STREAM) {
+                rc = sockets_connect(verbose, socket_ids, sockets, address, addrlen);
+                if (rc != EOK)
+                        return rc;
+        }
 
         if (verbose)
                 printf("\n");
 
-        if (ERROR_OCCURRED(gettimeofday(&time_before, NULL))) {
-                fprintf(stderr, "Get time of day error %d\n", ERROR_CODE);
-                return ERROR_CODE;
-        }
-
-        ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages));
-
-        if (ERROR_OCCURRED(gettimeofday(&time_after, NULL))) {
-                fprintf(stderr, "Get time of day error %d\n", ERROR_CODE);
-                return ERROR_CODE;
+        rc = gettimeofday(&time_before, NULL);
+        if (rc != EOK) {
+                fprintf(stderr, "Get time of day error %d\n", rc);
+                return rc;
+        }
+
+        rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages);
+        if (rc != EOK)
+                return rc;
+
+        rc = gettimeofday(&time_after, NULL);
+        if (rc != EOK) {
+                fprintf(stderr, "Get time of day error %d\n", rc);
+                return rc;
         }
 
@@ -296 +327 @@
         printf("sendto + recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before));
 
-        if (ERROR_OCCURRED(gettimeofday(&time_before, NULL))) {
-                fprintf(stderr, "Get time of day error %d\n", ERROR_CODE);
-                return ERROR_CODE;
-        }
-
-        ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, sockets, address, addrlen, data, size, messages));
-        ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages));
-
-        if (ERROR_OCCURRED(gettimeofday(&time_after, NULL))) {
-                fprintf(stderr, "Get time of day error %d\n", ERROR_CODE);
-                return ERROR_CODE;
+        rc = gettimeofday(&time_before, NULL);
+        if (rc != EOK) {
+                fprintf(stderr, "Get time of day error %d\n", rc);
+                return rc;
+        }
+
+        rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen, data, size, messages);
+        if (rc != EOK)
+                return rc;
+
+        rc = sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages);
+        if (rc != EOK)
+                return rc;
+
+        rc = gettimeofday(&time_after, NULL);
+        if (rc != EOK) {
+                fprintf(stderr, "Get time of day error %d\n", rc);
+                return rc;
         }
 
@@ -314 +352 @@
         printf("sendto, recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before));
 
-        ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets));
+        rc = sockets_close(verbose, socket_ids, sockets);
+        if (rc != EOK)
+                return rc;
 
         if (verbose)