chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d4795f
)
DEFINE_STRING_TABLE_LOOKUP: return _INVALID_* rather than assert on NULL string
author
Tom Gundersen
<teg@jklm.no>
Tue, 21 Jan 2014 23:14:04 +0000
(
00:14
+0100)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 22 Jan 2014 16:56:49 +0000
(17:56 +0100)
src/shared/util.h
patch
|
blob
|
history
diff --git
a/src/shared/util.h
b/src/shared/util.h
index ebc765da35668e4759093d4dbfcbb700183b4819..d6d746bc6a506386b7a33f1902f07756a8356d78 100644
(file)
--- 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)) \