From: Rob Landley <rob@landley.net>
Date: Sat, 1 Dec 2012 16:53:03 +0000 (-0600)
Subject: Would the compiler like to warn me about declaring two variables with the same name... 
X-Git-Tag: 0.4.2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed7abaf0968a850e262a2ae8f5a8e0b41aaa5879;p=platform%2Fupstream%2Ftoybox.git

Would the compiler like to warn me about declaring two variables with the same name in the same function? No? Carry on then...
---

diff --git a/toys/posix/expand.c b/toys/posix/expand.c
index 922f5e6..d1b82a7 100644
--- a/toys/posix/expand.c
+++ b/toys/posix/expand.c
@@ -44,30 +44,30 @@ static void expand_file(int fd, char *name)
     }
     if (!len) break;
     for (i=0; i<len; i++) {
-      int len = 1;
+      int width = 1;
       char c = toybuf[i];
 
       if (c != '\t') {
         if (EOF == putc(c, stdout)) perror_exit(0);
 
-        if (c == '\b' && x) len = -1;
+        if (c == '\b' && x) width = -1;
         if (c == '\n') {
           x = stop = 0;
           continue;
         }
       } else {
         if (TT.tabcount < 2) {
-          len = TT.tabcount ? *TT.tab : 8;
-          len -= x%len;
+          width = TT.tabcount ? *TT.tab : 8;
+          width -= x%width;
         } else while (stop < TT.tabcount) {
           if (TT.tab[stop] > x) {
-            len = TT.tab[stop] - x;
+            width = TT.tab[stop] - x;
             break;
           } else stop++;
         }
-        xprintf("%*c", len, ' ');
+        xprintf("%*c", width, ' ');
       }
-      x += len;
+      x += width;
     }
   }
 }