[Pkg-gnupg-commit] [libassuan] 207/437: 2007-09-07 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 0caa69e8f1bbc09d46a9099eeb1ce48fb55b67af
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Fri Sep 7 15:55:14 2007 +0000

    2007-09-07  Marcus Brinkmann  <marcus at g10code.de>
    
    	* assuan-inquire.c (assuan_inquire_ext): If MAXLEN is 0, still
    	initialize MEMBUF.
---
 src/assuan-inquire.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/assuan-inquire.c b/src/assuan-inquire.c
index 1701af8..54e1877 100644
--- a/src/assuan-inquire.c
+++ b/src/assuan-inquire.c
@@ -351,23 +351,18 @@ assuan_inquire_ext (assuan_context_t ctx, const char *keyword, size_t maxlen,
   assuan_error_t rc;
   struct membuf *mb = NULL;
   char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INQUIRE ")+CR,LF) */
-  int nodataexpected;
 
   if (!ctx || !keyword || (10 + strlen (keyword) >= sizeof (cmdbuf)))
     return _assuan_error (ASSUAN_Invalid_Value);
-  nodataexpected = !maxlen;
   if (!ctx->is_server)
     return _assuan_error (ASSUAN_Not_A_Server);
   if (ctx->in_inquire)
     return _assuan_error (ASSUAN_Nested_Commands);
 
-  if (!nodataexpected)
-    {
-      mb = malloc (sizeof (struct membuf));
-      if (!mb)
-	return _assuan_error (ASSUAN_Out_Of_Core);
-      init_membuf (mb, maxlen ? maxlen : 1024, maxlen);
-    }
+  mb = malloc (sizeof (struct membuf));
+  if (!mb)
+    return _assuan_error (ASSUAN_Out_Of_Core);
+  init_membuf (mb, maxlen ? maxlen : 1024, maxlen);
 
   strcpy (stpcpy (cmdbuf, "INQUIRE "), keyword);
   rc = assuan_write_line (ctx, cmdbuf);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git