summaryrefslogtreecommitdiff
path: root/libbb/compare_string_array.c
diff options
context:
space:
mode:
authorDenis Vlasenko2007-07-24 15:54:42 +0000
committerDenis Vlasenko2007-07-24 15:54:42 +0000
commit990d0f63eeb502c8762076e5c5499196e09cba55 (patch)
tree30a2091a8159b1694d65f9952e2aba2667d7dc11 /libbb/compare_string_array.c
parentbcb66ec22e82f6b1ab93f3aec917269393a5b464 (diff)
downloadbusybox-990d0f63eeb502c8762076e5c5499196e09cba55.zip
busybox-990d0f63eeb502c8762076e5c5499196e09cba55.tar.gz
Replace index_in_[sub]str_array with index_in_[sub]strings,
which scans thru "abc\0def\0123\0\0" type strings. Saves 250 bytes. text data bss dec hex filename 781266 1328 11844 794438 c1f46 busybox_old 781010 1328 11844 794182 c1e46 busybox_unstripped
Diffstat (limited to 'libbb/compare_string_array.c')
-rw-r--r--libbb/compare_string_array.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index 077a280..e873d7c 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -19,8 +19,23 @@ int index_in_str_array(const char * const string_array[], const char *key)
return -1;
}
+int index_in_strings(const char *strings, const char *key)
+{
+ int idx = 0;
+
+ while (strings[0]) {
+ if (strcmp(strings, key) == 0) {
+ return idx;
+ }
+ strings += strlen(strings) + 1; /* skip NUL */
+ idx++;
+ }
+ return -1;
+}
+
/* returns the array index of the string, even if it matches only a beginning */
/* (index of first match is returned, or -1) */
+#ifdef UNUSED
int index_in_substr_array(const char * const string_array[], const char *key)
{
int i;
@@ -34,3 +49,21 @@ int index_in_substr_array(const char * const string_array[], const char *key)
}
return -1;
}
+#endif
+
+int index_in_substrings(const char *strings, const char *key)
+{
+ int len = strlen(key);
+
+ if (len) {
+ int idx = 0;
+ while (strings[0]) {
+ if (strncmp(strings, key, len) == 0) {
+ return idx;
+ }
+ strings += strlen(strings) + 1; /* skip NUL */
+ idx++;
+ }
+ }
+ return -1;
+}