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/pki | |
| 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/pki')
| -rw-r--r-- | src/pki/commands/acert.c | 3 | ||||
| -rw-r--r-- | src/pki/commands/issue.c | 3 | ||||
| -rw-r--r-- | src/pki/commands/req.c | 3 | ||||
| -rw-r--r-- | src/pki/commands/self.c | 3 | ||||
| -rw-r--r-- | src/pki/commands/signcrl.c | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/pki/commands/acert.c b/src/pki/commands/acert.c index d49365db5..4a11c4716 100644 --- a/src/pki/commands/acert.c +++ b/src/pki/commands/acert.c @@ -53,8 +53,7 @@ static int acert() case 'h': goto usage; case 'g': - digest = enum_from_name(hash_algorithm_short_names, arg); - if (digest == -1) + if (!enum_from_name(hash_algorithm_short_names, arg, &digest)) { error = "invalid --digest type"; goto usage; diff --git a/src/pki/commands/issue.c b/src/pki/commands/issue.c index d03326e3d..339a88042 100644 --- a/src/pki/commands/issue.c +++ b/src/pki/commands/issue.c @@ -106,8 +106,7 @@ static int issue() } continue; case 'g': - digest = enum_from_name(hash_algorithm_short_names, arg); - if (digest == -1) + if (!enum_from_name(hash_algorithm_short_names, arg, &digest)) { error = "invalid --digest type"; goto usage; diff --git a/src/pki/commands/req.c b/src/pki/commands/req.c index 5b2c128b7..1dce8cba2 100644 --- a/src/pki/commands/req.c +++ b/src/pki/commands/req.c @@ -64,8 +64,7 @@ static int req() } continue; case 'g': - digest = enum_from_name(hash_algorithm_short_names, arg); - if (digest == -1) + if (!enum_from_name(hash_algorithm_short_names, arg, &digest)) { error = "invalid --digest type"; goto usage; diff --git a/src/pki/commands/self.c b/src/pki/commands/self.c index a35a42b89..80f5053a1 100644 --- a/src/pki/commands/self.c +++ b/src/pki/commands/self.c @@ -95,8 +95,7 @@ static int self() } continue; case 'g': - digest = enum_from_name(hash_algorithm_short_names, arg); - if (digest == -1) + if (!enum_from_name(hash_algorithm_short_names, arg, &digest)) { error = "invalid --digest type"; goto usage; diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c index c9eebbf59..3be020a4c 100644 --- a/src/pki/commands/signcrl.c +++ b/src/pki/commands/signcrl.c @@ -142,8 +142,7 @@ static int sign_crl() case 'h': goto usage; case 'g': - digest = enum_from_name(hash_algorithm_short_names, arg); - if (digest == -1) + if (!enum_from_name(hash_algorithm_short_names, arg, &digest)) { error = "invalid --digest type"; goto usage; |