Changeset f4f866c in mainline for uspace/app/nettest1/nettest1.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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 mainline changes.

File:

• uspace/app/nettest1/nettest1.c (modified) (7 diffs)

uspace/app/nettest1/nettest1.c

@@ -40 +40 @@
 #include <task.h>
 #include <time.h>
+#include <arg_parse.h>
 
 #include <in.h>
@@ -46 +47 @@
 #include <socket.h>
 #include <net_err.h>
+#include <socket_parse.h>
 
 #include "nettest.h"
-#include "parse.h"
 #include "print_error.h"
 
@@ -105 +106 @@
         struct timeval time_after;
 
-        // print the program label
-        printf("Task %d - ", task_get_id());
-        printf("%s\n", NAME);
-
         // parse the command line arguments
         // stop before the last argument if it does not start with the minus sign ('-')
@@ -117 +114 @@
                                 // short options with only one letter
                                 case 'f':
-                                        ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 0, parse_protocol_family));
+                                        ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family));
                                         break;
                                 case 'h':
@@ -124 +121 @@
                                         break;
                                 case 'm':
-                                        ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &messages, "message count", 0));
+                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0));
                                         break;
                                 case 'n':
-                                        ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &sockets, "socket count", 0));
+                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0));
                                         break;
                                 case 'p':
-                                        ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "port number", 0));
+                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0));
                                         port = (uint16_t) value;
                                         break;
                                 case 's':
-                                        ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "packet size", 0));
+                                        ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0));
                                         size = (value >= 0) ? (size_t) value : 0;
                                         break;
                                 case 't':
-                                        ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &value, "socket type", 0, parse_socket_type));
+                                        ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type));
                                         type = (sock_type_t) value;
                                         break;
@@ -147 +144 @@
                                 case '-':
                                         if(str_lcmp(argv[index] + 2, "family=", 7) == 0){
-                                                ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &family, "protocol family", 9, parse_protocol_family));
+                                                ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family));
                                         }else if(str_lcmp(argv[index] + 2, "help", 5) == 0){
                                                 nettest1_print_help();
                                                 return EOK;
                                         }else if(str_lcmp(argv[index] + 2, "messages=", 6) == 0){
-                                                ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &messages, "message count", 8));
+                                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8));
                                         }else if(str_lcmp(argv[index] + 2, "sockets=", 6) == 0){
-                                                ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &sockets, "socket count", 8));
+                                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8));
                                         }else if(str_lcmp(argv[index] + 2, "port=", 5) == 0){
-                                                ERROR_PROPAGATE(parse_parameter_int(argc, argv, &index, &value, "port number", 7));
+                                                ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7));
                                                 port = (uint16_t) value;
                                         }else if(str_lcmp(argv[index] + 2, "type=", 5) == 0){
-                                                ERROR_PROPAGATE(parse_parameter_name_int(argc, argv, &index, &value, "socket type", 7, parse_socket_type));
+                                                ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type));
                                                 type = (sock_type_t) value;
                                         }else if(str_lcmp(argv[index] + 2, "verbose", 8) == 0){
                                                 verbose = 1;
                                         }else{
-                                                print_unrecognized(index, argv[index] + 2);
                                                 nettest1_print_help();
                                                 return EINVAL;
@@ -170 +166 @@
                                         break;
                                 default:
-                                        print_unrecognized(index, argv[index] + 1);
                                         nettest1_print_help();
                                         return EINVAL;
                         }
                 }else{
-                        print_unrecognized(index, argv[index]);
                         nettest1_print_help();
                         return EINVAL;