diff options
| author | Werner Koch <[email protected]> | 2015-03-15 12:11:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-03-15 12:11:44 +0000 |
| commit | 3a35c9740ab792068ec4b3732ecfaa17bf4fc7f0 (patch) | |
| tree | 7163b8e42c107fe090f6aec213089b48d00a2244 | |
| parent | agent: Fix length test in sshcontrol parser. (diff) | |
| download | gnupg-3a35c9740ab792068ec4b3732ecfaa17bf4fc7f0.tar.gz gnupg-3a35c9740ab792068ec4b3732ecfaa17bf4fc7f0.zip | |
agent: Remove useless conditions in command.c.
* agent/command.c (cmd_setkeydesc): Remove NULL check.
(cmd_get_passphrase): Ditto.
(cmd_clear_passphrase): Ditto.
(cmd_get_confirmation): Ditto.
(cmd_getval): Ditto.
(cmd_putval): Ditto.
--
Detected by Stack 0.3.
| -rw-r--r-- | agent/command.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/agent/command.c b/agent/command.c index ca28e9ba2..96fbf19ce 100644 --- a/agent/command.c +++ b/agent/command.c @@ -718,7 +718,7 @@ cmd_setkeydesc (assuan_context_t ctx, char *line) if (p) *p = 0; /* We ignore any garbage; we might late use it for other args. */ - if (!desc || !*desc) + if (!*desc) return set_error (GPG_ERR_ASS_PARAMETER, "no description given"); /* Note, that we only need to replace the + characters and should @@ -1481,7 +1481,7 @@ cmd_get_passphrase (assuan_context_t ctx, char *line) } } } - if (!cacheid || !*cacheid || strlen (cacheid) > 50) + if (!*cacheid || strlen (cacheid) > 50) return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID"); if (!desc) return set_error (GPG_ERR_ASS_PARAMETER, "no description given"); @@ -1596,7 +1596,7 @@ cmd_clear_passphrase (assuan_context_t ctx, char *line) p = strchr (cacheid, ' '); if (p) *p = 0; /* ignore garbage */ - if (!cacheid || !*cacheid || strlen (cacheid) > 50) + if (!*cacheid || strlen (cacheid) > 50) return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID"); agent_put_cache (cacheid, opt_normal ? CACHE_MODE_NORMAL : CACHE_MODE_USER, @@ -1635,7 +1635,7 @@ cmd_get_confirmation (assuan_context_t ctx, char *line) if (p) *p = 0; /* We ignore any garbage -may be later used for other args. */ - if (!desc || !*desc) + if (!*desc) return set_error (GPG_ERR_ASS_PARAMETER, "no description given"); if (!strcmp (desc, "X")) @@ -2568,7 +2568,7 @@ cmd_getval (assuan_context_t ctx, char *line) if (*p) return set_error (GPG_ERR_ASS_PARAMETER, "too many arguments"); } - if (!key || !*key) + if (!*key) return set_error (GPG_ERR_ASS_PARAMETER, "no key given"); @@ -2635,7 +2635,7 @@ cmd_putval (assuan_context_t ctx, char *line) valuelen = percent_plus_unescape_inplace (value, 0); } } - if (!key || !*key) + if (!*key) return set_error (GPG_ERR_ASS_PARAMETER, "no key given"); |