GNUPG-1-9-BRANCH gnupg/agent (ChangeLog query.c)

[cvs user mo]

    Date: Friday, December 17, 2004 @ 21:41:50
  Author: mo
    Path: /cvs/gnupg/gnupg/agent
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog query.c

2004-12-17  Moritz Schulte  <moritz at g10code.com>

	* query.c: Undo change from 2004-12-05.


-----------+
 ChangeLog |    4 ++++
 query.c   |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


Index: gnupg/agent/ChangeLog
diff -u gnupg/agent/ChangeLog:1.59.2.45 gnupg/agent/ChangeLog:1.59.2.46
--- gnupg/agent/ChangeLog:1.59.2.45	Wed Dec 15 15:15:09 2004
+++ gnupg/agent/ChangeLog	Fri Dec 17 21:41:50 2004
@@ -1,3 +1,7 @@
+2004-12-17  Moritz Schulte  <moritz at g10code.com>
+
+	* query.c: Undo change from 2004-12-05.
+
 2004-12-15  Werner Koch  <wk at g10code.com>
 
 	* gpg-agent.c [W32]: Various hacks to make it work.
Index: gnupg/agent/query.c
diff -u gnupg/agent/query.c:1.23.2.5 gnupg/agent/query.c:1.23.2.6
--- gnupg/agent/query.c:1.23.2.5	Sun Dec  5 16:36:49 2004
+++ gnupg/agent/query.c	Fri Dec 17 21:41:50 2004
@@ -152,7 +152,7 @@
     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 @@
                         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 @@
       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 @@
       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 @@
       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 )