security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-06 23:17:47 +02:00
Code Activity

agent: Remove useless conditions in command.c.

Browse Source 
* 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.
This commit is contained in:
Werner Koch 2015-03-15 13:11:44 +01:00
parent 3529dd8bb5
commit 3a35c9740a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/command.c
View File

@ -718,7 +718,7 @@ cmd_setkeydesc (assuan_context_t ctx, char *line)
if (p) if (p)
*p = 0; /* We ignore any garbage; we might late use it for other args. */ *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"); return set_error (GPG_ERR_ASS_PARAMETER, "no description given");
/* Note, that we only need to replace the + characters and should /* 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"); return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID");
if (!desc) if (!desc)
return set_error (GPG_ERR_ASS_PARAMETER, "no description given"); 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, ' '); p = strchr (cacheid, ' ');
if (p) if (p)
*p = 0; /* ignore garbage */ *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"); return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID");
agent_put_cache (cacheid, opt_normal ? CACHE_MODE_NORMAL : CACHE_MODE_USER, 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) if (p)
*p = 0; /* We ignore any garbage -may be later used for other args. */ *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"); return set_error (GPG_ERR_ASS_PARAMETER, "no description given");
if (!strcmp (desc, "X")) if (!strcmp (desc, "X"))
@ -2568,7 +2568,7 @@ cmd_getval (assuan_context_t ctx, char *line)
if (*p) if (*p)
return set_error (GPG_ERR_ASS_PARAMETER, "too many arguments"); 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"); 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); valuelen = percent_plus_unescape_inplace (value, 0);
} }
} }
if (!key || !*key) if (!*key)
return set_error (GPG_ERR_ASS_PARAMETER, "no key given"); return set_error (GPG_ERR_ASS_PARAMETER, "no key given");