summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-06 23:37:20 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-06 23:37:20 +0200
commitd3725859f3d80972d7da3a73b92e58a06ac7d69a (patch)
tree704f6bd4b32b41fc87baa561d2a064b1938f03ba
parent2d368c149b90a7b284035f8883eb0c3e64a2caab (diff)
util: when parsing strings lookup tables accept integer strings, too
-rw-r--r--util.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/util.h b/util.h
index 273ece89f1..af39accc94 100644
--- a/util.h
+++ b/util.h
@@ -163,10 +163,14 @@ bool ignore_file(const char *filename);
} \
type name##_from_string(const char *s) { \
type i; \
+ unsigned u; \
assert(s); \
for (i = 0; i < (type)ELEMENTSOF(name##_table); i++) \
if (streq(name##_table[i], s)) \
return i; \
+ if (safe_atou(s, &u) >= 0 && \
+ u < ELEMENTSOF(name##_table)) \
+ return (type) u; \
return (type) -1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__