Changeset d8e3467 in mainline

Timestamp:

2010-04-18T00:22:35Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9dae191e

Parents:

c39a103

Message:

rename arg_short_long() to arg_parse_short_long() and move it to libc

Location:

uspace

Files:

• app/ping/ping.c (modified) (8 diffs)
• lib/c/generic/arg_parse.c (modified) (1 diff)
• lib/c/include/arg_parse.h (modified) (1 diff)

uspace/app/ping/ping.c

@@ -132 +132 @@
 }
 
-static int arg_short_long(const char *arg, const char *ashort,
-    const char *along)
-{
-        if (str_cmp(arg, ashort) == 0)
-                return 0;
-        
-        if (str_lcmp(arg, along, str_length(along)) == 0)
-                return str_length(along);
-        
-        return -1;
-}
-
 static int args_parse(int argc, char *argv[], ping_config_t *config)
 {
@@ -165 +153 @@
                 
                 int off;
-                int tmp;
                 
                 /* Usage */
-                if ((off = arg_short_long(argv[i], "-h", "--help")) != -1)
+                if ((off = arg_parse_short_long(argv[i], "-h", "--help")) != -1)
                         return CL_USAGE;
                 
                 /* Verbose */
-                if ((off = arg_short_long(argv[i], "-v", "--verbose")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-v", "--verbose")) != -1) {
                         config->verbose = true;
                         continue;
@@ -184 +171 @@
                 
                 /* Count */
-                if ((off = arg_short_long(argv[i], "-c", "--count=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-c", "--count=")) != -1) {
+                        int tmp;
                         ret = arg_parse_int(argc, argv, &i, &tmp, off);
                         
@@ -195 +183 @@
                 
                 /* Outgoing packet size */
-                if ((off = arg_short_long(argv[i], "-s", "--size=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-s", "--size=")) != -1) {
+                        int tmp;
                         ret = arg_parse_int(argc, argv, &i, &tmp, off);
                         
@@ -206 +195 @@
                 
                 /* Reply wait timeout */
-                if ((off = arg_short_long(argv[i], "-W", "--timeout=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-W", "--timeout=")) != -1) {
+                        int tmp;
                         ret = arg_parse_int(argc, argv, &i, &tmp, off);
                         
@@ -217 +207 @@
                 
                 /* Address family */
-                if ((off = arg_short_long(argv[i], "-f", "--family=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-f", "--family=")) != -1) {
                         ret = arg_parse_name_int(argc, argv, &i, &config->af, off,
                             socket_parse_address_family);
@@ -228 +218 @@
                 
                 /* Type of service */
-                if ((off = arg_short_long(argv[i], "-Q", "--tos=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-Q", "--tos=")) != -1) {
+                        int tmp;
                         ret = arg_parse_name_int(argc, argv, &i, &tmp, off,
                             socket_parse_address_family);
@@ -240 +231 @@
                 
                 /* Time to live */
-                if ((off = arg_short_long(argv[i], "-t", "--ttl=")) != -1) {
+                if ((off = arg_parse_short_long(argv[i], "-t", "--ttl=")) != -1) {
+                        int tmp;
                         ret = arg_parse_name_int(argc, argv, &i, &tmp, off,
                             socket_parse_address_family);

uspace/lib/c/generic/arg_parse.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str.h>
+
+int arg_parse_short_long(const char *arg, const char *ashort, const char *along)
+{
+        if (str_cmp(arg, ashort) == 0)
+                return 0;
+        
+        if (str_lcmp(arg, along, str_length(along)) == 0)
+                return str_length(along);
+        
+        return -1;
+}
 
 /** Parse the next argument as an integer.

uspace/lib/c/include/arg_parse.h

@@ -38 +38 @@
 typedef int (*arg_parser)(const char *, int *);
 
+extern int arg_parse_short_long(const char *, const char *, const char *);
 extern int arg_parse_int(int, char **, int *, int *, int);
 extern int arg_parse_name_int(int, char **, int *, int *, int, arg_parser);