summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2010-04-03 00:52:16 +0200
committerDenys Vlasenko2010-04-03 00:52:16 +0200
commit8a659f6ff9a364fb48fbfa95d70d09134b579627 (patch)
tree91bf7ada57a359c75a9319534e9b23de0c55079b /networking
parent05d1a32192011ef43248920db367653ccc4d980e (diff)
downloadbusybox-8a659f6ff9a364fb48fbfa95d70d09134b579627.zip
busybox-8a659f6ff9a364fb48fbfa95d70d09134b579627.tar.gz
libbb: make index_in_substrings return -1 on ambiguous matches
function old new delta index_in_substrings 67 93 +26 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/brctl.c4
-rw-r--r--networking/udhcp/common.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/networking/brctl.c b/networking/brctl.c
index 023518a..a36ab45 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -220,10 +220,10 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
}
#if ENABLE_FEATURE_BRCTL_FANCY
if (key == ARG_stp) { /* stp */
- static const char stp_opts[] ALIGN1 =
+ static const char no_yes[] ALIGN1 =
"0\0" "off\0" "n\0" "no\0" /* 0 .. 3 */
"1\0" "on\0" "y\0" "yes\0"; /* 4 .. 7 */
- int onoff = index_in_strings(stp_opts, *argv);
+ int onoff = index_in_strings(no_yes, *argv);
if (onoff < 0)
bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
onoff = (unsigned)onoff / 4;
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 6e8ec3e..adbcd77 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -435,8 +435,8 @@ int FAST_FUNC udhcp_str2optset(const char *const_str, void *arg)
}
break;
// case OPTION_BOOLEAN: {
-// static const char noyes[] ALIGN1 = "no\0yes\0";
-// buffer[0] = retval = index_in_strings(noyes, val);
+// static const char no_yes[] ALIGN1 = "no\0yes\0";
+// buffer[0] = retval = index_in_strings(no_yes, val);
// retval++; /* 0 - bad; 1: "no" 2: "yes" */
// break;
// }