From: Tom Gundersen <teg@jklm.no>
Date: Tue, 21 Jan 2014 23:14:04 +0000 (+0100)
Subject: DEFINE_STRING_TABLE_LOOKUP: return _INVALID_* rather than assert on NULL string
X-Git-Tag: v209~366
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c3d81d4a7e3888632537140aae57940159fb39e;p=platform%2Fupstream%2Fsystemd.git

DEFINE_STRING_TABLE_LOOKUP: return _INVALID_* rather than assert on NULL string
---

diff --git a/src/shared/util.h b/src/shared/util.h
index ebc765d..d6d746b 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -295,7 +295,8 @@ static inline uint32_t random_u32(void) {
         }                                                               \
         scope type name##_from_string(const char *s) {                  \
                 type i;                                                 \
-                assert(s);                                              \
+                if (!s)                                                 \
+                        return (type) -1;                               \
                 for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
                         if (name##_table[i] &&                          \
                             streq(name##_table[i], s))                  \