[Pkg-gnupg-commit] [gnupg2] 64/102: w32: Fix recent build regression.

[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 6790115fd9059e066b4e6feb6b1e3876a1c1d522
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 8 15:14:06 2016 +0200

    w32: Fix recent build regression.
    
    * common/homedir.c (_gnupg_socketdir_internal) [W32]: Add definition
    for NAME.
    * g10/gpg.c (main) [W32]:  Fix use og gnupg_homedir.
    
    * agent/gpg-agent.c (remove_socket): Remove unused var P.
    * scd/scdaemon.c (cleanup): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/gpg-agent.c | 2 --
 common/homedir.c  | 2 ++
 g10/gpg.c         | 2 +-
 scd/scdaemon.c    | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index d140ba5..538ff08 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -555,8 +555,6 @@ remove_socket (char *name, char *redir_name)
 {
   if (name && *name)
     {
-      char *p;
-
       if (redir_name)
         name = redir_name;
 
diff --git a/common/homedir.c b/common/homedir.c
index 58f100f..9a69022 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -454,6 +454,8 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
 {
 #if defined(HAVE_W32_SYSTEM) || !defined(HAVE_STAT)
 
+  char *name;
+
   (void)skip_checks;
   *r_info = 0;
   name = xstrdup (gnupg_homedir ());
diff --git a/g10/gpg.c b/g10/gpg.c
index 0a5af70..87d06af 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2285,7 +2285,7 @@ main (int argc, char **argv)
     }
 
 #ifdef HAVE_DOSISH_SYSTEM
-    if ( strchr (gnupg_homedir, '\\') ) {
+    if ( strchr (gnupg_homedir (), '\\') ) {
       char *d, *buf = xmalloc (strlen (gnupg_homedir ())+1);
       const char *s;
       for (d=buf, s = gnupg_homedir (); *s; s++)
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index c468a84..8303acc 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -371,7 +371,6 @@ cleanup (void)
   if (socket_name && *socket_name)
     {
       char *name;
-      char *p;
 
       name = redir_socket_name? redir_socket_name : socket_name;
 

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