- dtucker@cvs.openbsd.org 2012/06/22 14:36:33

     [sftp.c]
     Remove unused variable leftover from tab-completion changes.
     From Steve.McClellan at radisys com, ok markus@

diff --git a/ChangeLog b/ChangeLog
index a76c408f1dd67425dc7bab182fc321e943255299..5c00e1863cb0a0f971650aa669740306bb16e859 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
      [monitor.c sshconnect2.c]
      remove dead code following 'for (;;)' loops.
      From Steve.McClellan at radisys com, ok markus@
+   - dtucker@cvs.openbsd.org 2012/06/22 14:36:33
+     [sftp.c]
+     Remove unused variable leftover from tab-completion changes.
+     From Steve.McClellan at radisys com, ok markus@
 
 20120628
  - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null

diff --git a/sftp.c b/sftp.c
index 22cf314576394da3d6fc03cba99693c72a2a6b2a..235c6ad04f3790490319a84dd92a0d82313d73ee 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.135 2012/04/20 03:24:23 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.136 2012/06/22 14:36:33 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -783,7 +783,6 @@ static int
 do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
     int lflag)
 {
-       Attrib *a = NULL;
        char *fname, *lname;
        glob_t g;
        int err;
@@ -829,7 +828,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
                colspace = width / columns;
        }
 
-       for (i = 0; g.gl_pathv[i] && !interrupted; i++, a = NULL) {
+       for (i = 0; g.gl_pathv[i] && !interrupted; i++) {
                fname = path_strip(g.gl_pathv[i], strip_path);
                if (lflag & LS_LONG_VIEW) {
                        if (g.gl_statv[i] == NULL) {