I enabled some extra warnings for hidden local variables and for hidden

virtual functions and caught some things and did some general code cleanup.

llvm-svn: 108299

4 files changed, 17 insertions, 11 deletions

diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
index 123a5ade061..a1b973b74ef 100644
--- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
@@ -258,12 +258,15 @@ CommandObjectBreakpointCommandAdd::Execute
                     {
                         if (m_options.m_use_script_language)
                         {
-                            interpreter.GetScriptInterpreter()->CollectDataForBreakpointCommandCallback (bp_loc_sp->GetLocationOptions(),
-                                                                                                          result);
+                            interpreter.GetScriptInterpreter()->CollectDataForBreakpointCommandCallback (interpreter,
+                                                                                                         bp_loc_sp->GetLocationOptions(),
+                                                                                                         result);
                         }
                         else
                         {
-                            CollectDataForBreakpointCommandCallback (interpreter, bp_loc_sp->GetLocationOptions(), result);
+                            CollectDataForBreakpointCommandCallback (interpreter, 
+                                                                     bp_loc_sp->GetLocationOptions(), 
+                                                                     result);
                         }
                     }
                 }
@@ -271,12 +274,15 @@ CommandObjectBreakpointCommandAdd::Execute
                 {
                     if (m_options.m_use_script_language)
                     {
-                        interpreter.GetScriptInterpreter()->CollectDataForBreakpointCommandCallback (bp->GetOptions(),
-                                                                                                      result);
+                        interpreter.GetScriptInterpreter()->CollectDataForBreakpointCommandCallback (interpreter,
+                                                                                                     bp->GetOptions(),
+                                                                                                     result);
                     }
                     else
                     {
-                        CollectDataForBreakpointCommandCallback (interpreter, bp->GetOptions(), result);
+                        CollectDataForBreakpointCommandCallback (interpreter, 
+                                                                 bp->GetOptions(), 
+                                                                 result);
                     }
                 }
             }
diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp
index 0b61816fbcb..b6b0d2469e9 100644
--- a/lldb/source/Commands/CommandObjectImage.cpp
+++ b/lldb/source/Commands/CommandObjectImage.cpp
@@ -1395,9 +1395,9 @@ public:
                     
                     if (num_matching_modules > 0)
                     {
-                        for (size_t i=0; i<num_matching_modules; ++i)
+                        for (size_t j=0; j<num_matching_modules; ++j)
                         {
-                            Module * image_module = matching_modules.GetModulePointerAtIndex(i);
+                            Module * image_module = matching_modules.GetModulePointerAtIndex(j);
                             if (image_module)
                             {
                                 if (LookupInModule (interpreter, image_module, result, syntax_error))
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 69467511604..20b008ff5a5 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -536,7 +536,7 @@ public:
                 result.AppendMessageWithFormat ("Resuming process %i\n", process->GetID());
                 if (synchronous_execution)
                 {
-                    StateType state = process->WaitForProcessToStop (NULL);
+                    state = process->WaitForProcessToStop (NULL);
 
                     result.SetDidChangeProcessState (true);
                     result.AppendMessageWithFormat ("Process %i %s\n", process->GetID(), StateAsCString (state));
diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index 0934045fd5b..6c38758e3fc 100644
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -760,7 +760,7 @@ public:
                 result.AppendMessageWithFormat ("Resuming process %i\n", process->GetID());
                 if (synchronous_execution)
                 {
-                    StateType state = process->WaitForProcessToStop (NULL);
+                    state = process->WaitForProcessToStop (NULL);
 
                     result.SetDidChangeProcessState (true);
                     result.AppendMessageWithFormat ("Process %i %s\n", process->GetID(), StateAsCString (state));
@@ -827,7 +827,7 @@ public:
             {
                 case 't':
                 {
-                    uint32_t m_thread_idx = Args::StringToUInt32 (option_arg, LLDB_INVALID_INDEX32);
+                    m_thread_idx = Args::StringToUInt32 (option_arg, LLDB_INVALID_INDEX32);
                     if (m_thread_idx == LLDB_INVALID_INDEX32)
                     {
                         error.SetErrorStringWithFormat ("Invalid thread index '%s'.\n", option_arg);