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/conftest/hooks/custom_proposal.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/conftest/hooks/custom_proposal.c')
| -rw-r--r-- | src/conftest/hooks/custom_proposal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/conftest/hooks/custom_proposal.c b/src/conftest/hooks/custom_proposal.c index 38d4286c4..6086d13b5 100644 --- a/src/conftest/hooks/custom_proposal.c +++ b/src/conftest/hooks/custom_proposal.c @@ -79,8 +79,7 @@ static linked_list_t* load_proposals(private_custom_proposal_t *this, type = strtoul(key, &end, 10); if (end == key || errno) { - type = enum_from_name(transform_type_names, key); - if (type == -1) + if (!enum_from_name(transform_type_names, key, &type)) { DBG1(DBG_CFG, "unknown transform: '%s', skipped", key); continue; |