[Pkg-gnupg-commit] [gnupg2] 55/132: agent: Simplify stream_read_cstring.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit c64763c3a74ecc61c2f6c5edb679a2a3879d79e7
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 09:24:48 2017 +0900

    agent: Simplify stream_read_cstring.
    
    * agent/command-ssh.c (stream_read_cstring): Just call
    stream_read_string.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 agent/command-ssh.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index b15d8b2..eeb1498 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -674,13 +674,7 @@ stream_read_blob (estream_t stream, unsigned int secure, gcry_mpi_t *r_mpi)
 static gpg_error_t
 stream_read_cstring (estream_t stream, char **string)
 {
-  gpg_error_t err;
-  unsigned char *buffer;
-
-  err = stream_read_string (stream, 0, &buffer, NULL);
-  if (!err)
-    *string = (char *)buffer;
-  return err;
+  return stream_read_string (stream, 0, (unsigned char **)string, NULL);
 }
 
 

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