security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-28 02:12:46 +02:00
Code Activity

w32: Fix recent build regression.

Browse Source 
* 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@gnupg.org>
This commit is contained in:
Werner Koch 2016-06-08 15:14:06 +02:00
parent cf4910419e
commit 6790115fd9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/gpg-agent.c
View File

@ -555,8 +555,6 @@ remove_socket (char *name, char *redir_name)
{ {
if (name && *name) if (name && *name)
{ {
char *p;
if (redir_name) if (redir_name)
name = redir_name; name = redir_name;

2
common/homedir.c
View File

@ -454,6 +454,8 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
{ {
#if defined(HAVE_W32_SYSTEM) || !defined(HAVE_STAT) #if defined(HAVE_W32_SYSTEM) || !defined(HAVE_STAT)
char *name;
(void)skip_checks; (void)skip_checks;
*r_info = 0; *r_info = 0;
name = xstrdup (gnupg_homedir ()); name = xstrdup (gnupg_homedir ());

2
g10/gpg.c
View File

@ -2285,7 +2285,7 @@ main (int argc, char **argv)
} }
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
if ( strchr (gnupg_homedir, '\\') ) { if ( strchr (gnupg_homedir (), '\\') ) {
char *d, *buf = xmalloc (strlen (gnupg_homedir ())+1); char *d, *buf = xmalloc (strlen (gnupg_homedir ())+1);
const char *s; const char *s;
for (d=buf, s = gnupg_homedir (); *s; s++) for (d=buf, s = gnupg_homedir (); *s; s++)

1
scd/scdaemon.c
View File

@ -371,7 +371,6 @@ cleanup (void)
if (socket_name && *socket_name) if (socket_name && *socket_name)
{ {
char *name; char *name;
char *p;
name = redir_socket_name? redir_socket_name : socket_name; name = redir_socket_name? redir_socket_name : socket_name;