diff options
| author | Martin Willi <martin@revosec.ch> | 2014-05-16 11:57:54 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-05-16 15:42:07 +0200 |
| commit | 064fe9c963b7aa0ea904ab15443198d965175461 (patch) | |
| tree | baafea8cdeb46701d996a07fa2bbb2c54fdf3458 /src/libstrongswan/utils/enum.c | |
| parent | 9ee8b3b41f9dd24e49f4fd80c5891f134b38d161 (diff) | |
| download | strongswan-064fe9c963b7aa0ea904ab15443198d965175461.tar.bz2 strongswan-064fe9c963b7aa0ea904ab15443198d965175461.tar.xz | |
enum: Return boolean result for enum_from_name() lookup
Handling the result for enum_from_name() is difficult, as checking for
negative return values requires a cast if the enum type is unsigned. The new
signature clearly differentiates lookup result from lookup value.
Further, this actually allows to convert real -1 enum values, which could not
be distinguished from "not-found" and the -1 return value.
This also fixes several clang warnings where enums are unsigned.
Diffstat (limited to 'src/libstrongswan/utils/enum.c')
| -rw-r--r-- | src/libstrongswan/utils/enum.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c index 465121e79..f96fe2989 100644 --- a/src/libstrongswan/utils/enum.c +++ b/src/libstrongswan/utils/enum.c @@ -40,7 +40,7 @@ char *enum_to_name(enum_name_t *e, int val) /** * See header. */ -int enum_from_name(enum_name_t *e, char *name) +bool enum_from_name_as_int(enum_name_t *e, const char *name, int *val) { do { @@ -50,12 +50,13 @@ int enum_from_name(enum_name_t *e, char *name) { if (name && strcaseeq(name, e->names[i])) { - return e->first + i; + *val = e->first + i; + return TRUE; } } } while ((e = e->next)); - return -1; + return FALSE; } /** |