cli: Share a common get_cmd_arg_num() implementation

wpa_cli and hostapd_cli had identical copies of this function.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 376a02572496b7e154e53a7626fa6e1a1f8a2855..56f5fe25105d6d1f2e1f52b29cd389df4efdac21 100644 (file)
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -74,24 +74,6 @@ static void usage(void)
 }
 
 
-static int get_cmd_arg_num(const char *str, int pos)
-{
-       int arg = 0, i;
-
-       for (i = 0; i <= pos; i++) {
-               if (str[i] != ' ') {
-                       arg++;
-                       while (i <= pos && str[i] != ' ')
-                               i++;
-               }
-       }
-
-       if (arg > 0)
-               arg--;
-       return arg;
-}
-
-
 static void register_event_handler(struct wpa_ctrl *ctrl)
 {
        if (!ctrl_conn)

diff --git a/src/common/cli.c b/src/common/cli.c
index 24f465ca5025054ceb9965b03a63a0955d0ea178..6e0018875db4036f8cd57498bc6b418aa9b67de2 100644 (file)
--- a/src/common/cli.c
+++ b/src/common/cli.c
@@ -188,3 +188,21 @@ char ** cli_txt_list_array(struct dl_list *txt_list)
 
        return res;
 }
+
+
+int get_cmd_arg_num(const char *str, int pos)
+{
+       int arg = 0, i;
+
+       for (i = 0; i <= pos; i++) {
+               if (str[i] != ' ') {
+                       arg++;
+                       while (i <= pos && str[i] != ' ')
+                               i++;
+               }
+       }
+
+       if (arg > 0)
+               arg--;
+       return arg;
+}

diff --git a/src/common/cli.h b/src/common/cli.h
index 4b44ce27d43385654cfd95b58841c64f32cd145d..4caf321c4956a89103b8ef9926e941996b275511 100644 (file)
--- a/src/common/cli.h
+++ b/src/common/cli.h
@@ -37,4 +37,6 @@ int cli_txt_list_add_word(struct dl_list *txt_list, const char *txt,
 
 char ** cli_txt_list_array(struct dl_list *txt_list);
 
+int get_cmd_arg_num(const char *str, int pos);
+
 #endif /* CLI_H */

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 7614218126dad2bfc21c77d3bb964282f3478dfc..42be5b6f64d5fc82506019d6240ff0581a902693 100644 (file)
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -90,24 +90,6 @@ static void usage(void)
 }
 
 
-static int get_cmd_arg_num(const char *str, int pos)
-{
-       int arg = 0, i;
-
-       for (i = 0; i <= pos; i++) {
-               if (str[i] != ' ') {
-                       arg++;
-                       while (i <= pos && str[i] != ' ')
-                               i++;
-               }
-       }
-
-       if (arg > 0)
-               arg--;
-       return arg;
-}
-
-
 static int wpa_cli_show_event(const char *event)
 {
        const char *start;