[Pkg-gnupg-commit] [gnupg2] 154/292: agent: Minor cleanup for recent change in findkey.c

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 8c40b3b98d3ddeda79fde981e6539c5b3b09d9a2
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 24 13:01:06 2016 +0200

    agent: Minor cleanup for recent change in findkey.c
    
    * agent/findkey.c (agent_write_private_key): Avoid label name error.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/findkey.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/agent/findkey.c b/agent/findkey.c
index 162e8c2..c67dc72 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -157,14 +157,10 @@ agent_write_private_key (const unsigned char *grip,
         {
           fp = es_fopen (fname, "wbx,mode=-rw");
           if (!fp)
-            {
-              tmperr = gpg_error_from_syserror ();
-              goto error;
-            }
+            tmperr = gpg_error_from_syserror ();
         }
-      else
+      if (!fp)
         {
-        error:
           log_error ("can't create '%s': %s\n", fname, gpg_strerror (tmperr));
           xfree (fname);
           return tmperr;

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