From c21367ab003e73a27c121df77da8225c2c319d87 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Mon, 12 Sep 2005 18:44:43 +0000 Subject: [PATCH] Wshadow --- directory.cc | 5 +++-- led.cc | 4 ++-- log.cc | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/directory.cc b/directory.cc index 20bd284..6b9d636 100644 --- a/directory.cc +++ b/directory.cc @@ -36,14 +36,15 @@ Directory::~Directory() { if (name) delete[] name; index = -1; // just in case + UINT i; - for (UINT i = 0; i < dirList.size(); i++) + for (i = 0; i < dirList.size(); i++) { delete dirList[i]; } dirList.clear(); - for (UINT i = 0; i < recList.size(); i++) + for (i = 0; i < recList.size(); i++) { delete recList[i]; } diff --git a/led.cc b/led.cc index a4bffbf..041b36e 100644 --- a/led.cc +++ b/led.cc @@ -40,11 +40,11 @@ Led* Led::getInstance() return instance; } -int Led::init(int device) +int Led::init(int tdevice) { if (initted) return 0; initted = 1; - this->device = device; + device = tdevice; return 1; } diff --git a/log.cc b/log.cc index c75801b..bc3d2ef 100644 --- a/log.cc +++ b/log.cc @@ -97,8 +97,8 @@ int Log::log(char *fromModule, int level, char* message, ...) struct timeval tv; gettimeofday(&tv, NULL); - struct tm* tm = localtime(&tv.tv_sec); - spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", tm); + struct tm* tms = localtime(&tv.tv_sec); + spaceLeft -= strftime(buffer, spaceLeft, "%H:%M:%S.", tms); spaceLeft -= snprintf(&buffer[150-spaceLeft], spaceLeft, "%06lu ", (unsigned long)tv.tv_usec); -- 2.39.5