DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wlantest: Replace the duplicate functions with reuse of cli.h

Browse source 
The definitions of max_args, get_cmd_arg_num(), and tokenize_cmd() are
already shared by the hostapd_cli and wpa_cli commands by including the
cli.h header. So follow the same for wlantest_cli and remove the
duplicate function defitions.

Signed-off-by: Gokul Sivakumar <gokulkumar792@gmail.com>
This commit is contained in:
Gokul Sivakumar 2021-11-03 22:20:22 +05:30 committed by Jouni Malinen
parent daea5ceada
commit d9d0b94e3b
2 changed files with 2 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wlantest/Makefile
View file

@ -64,6 +64,7 @@ TOBJS += gcmp.o
OBJS_cli = wlantest_cli.o OBJS_cli = wlantest_cli.o
OBJS_cli += ../src/common/cli.o
_OBJS_VAR := OBJS _OBJS_VAR := OBJS
include ../src/objs.mk include ../src/objs.mk

51
wlantest/wlantest_cli.c
View file

@ -12,30 +12,13 @@
#include "utils/common.h" #include "utils/common.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "utils/edit.h" #include "utils/edit.h"
#include "common/cli.h"
#include "wlantest_ctrl.h" #include "wlantest_ctrl.h"
static void print_help(FILE *stream, const char *cmd); static void print_help(FILE *stream, const char *cmd);
static char ** wlantest_cli_cmd_list(void); static char ** wlantest_cli_cmd_list(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 get_prev_arg_pos(const char *str, int pos) static int get_prev_arg_pos(const char *str, int pos)
{ {
while (pos > 0 && str[pos - 1] != ' ') while (pos > 0 && str[pos - 1] != ' ')
@ -1732,38 +1715,6 @@ struct wlantest_cli {
}; };
#define max_args 10
static int tokenize_cmd(char *cmd, char *argv[])
{
char *pos;
int argc = 0;
pos = cmd;
for (;;) {
while (*pos == ' ')
pos++;
if (*pos == '\0')
break;
argv[argc] = pos;
argc++;
if (argc == max_args)
break;
if (*pos == '"') {
char *pos2 = os_strrchr(pos, '"');
if (pos2)
pos = pos2 + 1;
}
while (*pos != '\0' && *pos != ' ')
pos++;
if (*pos == ' ')
*pos++ = '\0';
}
return argc;
}
static void wlantest_cli_edit_cmd_cb(void *ctx, char *cmd) static void wlantest_cli_edit_cmd_cb(void *ctx, char *cmd)
{ {
struct wlantest_cli *cli = ctx; struct wlantest_cli *cli = ctx;