- avsm@cvs.openbsd.org 2004/06/21 17:36:31
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
sshpty.c]
make ssh -Wshadow clean, no functional changes
markus@ ok
There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.
diff --git a/sftp.c b/sftp.c
index df2aff6..d818ef8 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.50 2004/06/20 18:53:39 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.51 2004/06/21 17:36:31 avsm Exp $");
#include "buffer.h"
#include "xmalloc.h"
@@ -277,13 +277,13 @@
static char *
make_absolute(char *p, char *pwd)
{
- char *abs;
+ char *abs_str;
/* Derelativise */
if (p && p[0] != '/') {
- abs = path_append(pwd, p);
+ abs_str = path_append(pwd, p);
xfree(p);
- return(abs);
+ return(abs_str);
} else
return(p);
}