diff options
| author | Moritz Schulte <[email protected]> | 2004-12-17 20:41:50 +0000 |
|---|---|---|
| committer | Moritz Schulte <[email protected]> | 2004-12-17 20:41:50 +0000 |
| commit | d75eda2b87af9bf605a92c11a20b8979129a4e44 (patch) | |
| tree | 1ad05090440a460af04a39263b2fb364f3c16be5 /agent/query.c | |
| parent | * call-dirmngr.c (isvalid_status_cb, lookup_status_cb) (diff) | |
| download | gnupg-d75eda2b87af9bf605a92c11a20b8979129a4e44.tar.gz gnupg-d75eda2b87af9bf605a92c11a20b8979129a4e44.zip | |
2004-12-17 Moritz Schulte <[email protected]>
* query.c: Undo change from 2004-12-05.
Diffstat (limited to 'agent/query.c')
| -rw-r--r-- | agent/query.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/agent/query.c b/agent/query.c index cdf6ff259..b514f6f5e 100644 --- a/agent/query.c +++ b/agent/query.c @@ -152,7 +152,7 @@ start_pinentry (CTRL ctrl) pgmname++; argv[0] = pgmname; - if (ctrl && ctrl->display && !opt.keep_display) + if (ctrl->display && !opt.keep_display) { argv[1] = "--display"; argv[2] = ctrl->display; @@ -189,7 +189,7 @@ start_pinentry (CTRL ctrl) NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return unlock_pinentry (map_assuan_err (rc)); - if (ctrl && ctrl->ttyname) + if (ctrl->ttyname) { char *optstr; if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 ) @@ -200,7 +200,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->ttytype) + if (ctrl->ttytype) { char *optstr; if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 ) @@ -210,7 +210,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->lc_ctype) + if (ctrl->lc_ctype) { char *optstr; if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 ) @@ -220,7 +220,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->lc_messages) + if (ctrl->lc_messages) { char *optstr; if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 ) |