scons: Fix up numerous warnings about name shadowing

This patch address the most important name shadowing warnings (as
produced when using gcc/clang with -Wshadow). There are many
locations where constructor parameters and function parameters shadow
local variables, but these are left unchanged.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index e856e2263..7a4c551ce 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -186,17 +186,17 @@ Printk(stringstream &out, Arguments args)
                 case 'c': {
                     uint64_t mask = (*p == 'C') ? 0xffL : 0x7fL;
                     uint64_t num;
-                    int width;
+                    int cwidth;
 
                     if (islong) {
                         num = (uint64_t)args;
-                        width = sizeof(uint64_t);
+                        cwidth = sizeof(uint64_t);
                     } else {
                         num = (uint32_t)args;
-                        width = sizeof(uint32_t);
+                        cwidth = sizeof(uint32_t);
                     }
 
-                    while (width-- > 0) {
+                    while (cwidth-- > 0) {
                         char c = (char)(num & mask);
                         if (c)
                             out << c;