diff --git a/ChangeLog b/ChangeLog index a10e69f41..7cac8a951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,9 @@ [sftp.1 sftp-client.c sftp-client.h sftp-common.c sftp-common.h] [sftp-glob.c sftp-glob.h sftp-int.c sftp-server.c] support for short/long listings and globbing in "ls"; ok markus@ + - djm@cvs.openbsd.org 2002/09/12 00:13:06 + [sftp-int.c] + zap unused var introduced in last commit 20020911 - (djm) Sync openbsd-compat with OpenBSD -current @@ -1648,4 +1651,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2459 2002/09/12 00:32:59 djm Exp $ +$Id: ChangeLog,v 1.2460 2002/09/12 00:34:13 djm Exp $ diff --git a/sftp-int.c b/sftp-int.c index d3dc085e2..6a2012910 100644 --- a/sftp-int.c +++ b/sftp-int.c @@ -25,7 +25,7 @@ /* XXX: recursive operations */ #include "includes.h" -RCSID("$OpenBSD: sftp-int.c,v 1.48 2002/09/11 22:41:50 djm Exp $"); +RCSID("$OpenBSD: sftp-int.c,v 1.49 2002/09/12 00:13:06 djm Exp $"); #include "buffer.h" #include "xmalloc.h" @@ -205,7 +205,6 @@ static char * path_strip(char *path, char *strip) { size_t len; - char *ret; if (strip == NULL) return (xstrdup(path));