diff options
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | miscutils/devfsd.c | 4 | ||||
| -rw-r--r-- | networking/libiproute/ipaddress.c | 6 | ||||
| -rw-r--r-- | networking/libiproute/iproute.c | 10 |
4 files changed, 12 insertions, 10 deletions
diff --git a/include/libbb.h b/include/libbb.h index 96dc46a09..52d91c826 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -467,7 +467,7 @@ typedef struct { } procps_status_t; extern procps_status_t * procps_scan(int save_user_arg0); -extern unsigned short compare_string_array(const char *string_array[], const char *key); +extern int compare_string_array(const char * const string_array[], const char *key); extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret); diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index cc1c5e1f0..62d217345 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -611,7 +611,7 @@ static void process_config_line (const char *line, unsigned long *event_mask) "PERMISSIONS", "MODLOAD", "EXECUTE", "COPY", "IGNORE", "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT", 0 }; - short int i; + int i; debug_msg_logger(LOG_INFO, __FUNCTION__); @@ -1295,7 +1295,7 @@ static const char *get_variable (const char *variable, void *info) const char *field_names[] = { "hostname", "mntpt", "devpath", "devname", "uid", "gid", "mode", hostname, mount_point, gv_info->devpath, gv_info->devname, 0 }; - short int i; + int i; debug_msg_logger(LOG_INFO, __FUNCTION__); diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 1c89f4a7d..c6115b356 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c @@ -443,7 +443,7 @@ extern int ipaddr_list_or_flush(int argc, char **argv, int flush) } while (argc > 0) { - const unsigned short option_num = compare_string_array(option, *argv); + const int option_num = compare_string_array(option, *argv); switch (option_num) { case 0: /* to */ NEXT_ARG(); @@ -658,7 +658,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) req.ifa.ifa_family = preferred_family; while (argc > 0) { - const unsigned short option_num = compare_string_array(option, *argv); + const int option_num = compare_string_array(option, *argv); switch (option_num) { case 0: /* peer */ case 1: /* remote */ @@ -805,7 +805,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) extern int do_ipaddr(int argc, char **argv) { const char *commands[] = { "add", "delete", "list", "show", "lst", "flush", 0 }; - unsigned short command_num = 2; + int command_num = 2; if (*argv) { command_num = compare_string_array(commands, *argv); diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index cc229c206..d7900d62e 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -654,7 +654,8 @@ static int iproute_get(int argc, char **argv) char *odev = NULL; int connected = 0; int from_ok = 0; - const char *options[] = { "from", "iif", "oif", "dev", "notify", "connected", "to", 0 }; + static const char * const options[] = + { "from", "iif", "oif", "dev", "notify", "connected", "to", 0 }; memset(&req, 0, sizeof(req)); @@ -813,9 +814,10 @@ static int iproute_get(int argc, char **argv) int do_iproute(int argc, char **argv) { - const char *ip_route_commands[] = { "add", "append", "change", "chg", - "delete", "del", "get", "list", "show", "prepend", "replace", "test", "flush", 0 }; - unsigned short command_num = 7; + static const char * const ip_route_commands[] = + { "add", "append", "change", "chg", "delete", "del", "get", + "list", "show", "prepend", "replace", "test", "flush", 0 }; + int command_num = 7; unsigned int flags = 0; int cmd = RTM_NEWROUTE; |