commit bdcb6abaa287df2c5f312c51d993c1d0b0cb120c
author Greg Clayton <gclayton@apple.com> Tue Jan 25 23:55:37 2011 +0000
committer Greg Clayton <gclayton@apple.com> Tue Jan 25 23:55:37 2011 +0000
tree 066dbc1dd0fc8eff1b54a22c0beae4a75e6f1ae2
parent 60c0d627a506752b3b9ef5c0b11f1640b739b9ff

Enabled extra warnings and fixed a bunch of small issues.



git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@124250 91177308-0d34-0410-b5e6-96231b3b80d8

source/Expression/ClangExpressionDeclMap.cpp

diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index f996242..5c377cf 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -1402,17 +1402,15 @@
 {
     uint32_t register_number = reg_info.kinds[lldb::eRegisterKindLLDB];
     uint32_t register_byte_size = reg_info.byte_size;
-    
-    Error error;
-    
+
     if (dematerialize)
     {
         DataBufferHeap register_data (register_byte_size, 0);
         
-        Error error;
-        if (exe_ctx.process->ReadMemory (addr, register_data.GetBytes(), register_byte_size, error) != register_byte_size)
+        Error read_error;
+        if (exe_ctx.process->ReadMemory (addr, register_data.GetBytes(), register_byte_size, read_error) != register_byte_size)
         {
-            err.SetErrorStringWithFormat ("Couldn't read %s from the target: %s", reg_info.name, error.AsCString());
+            err.SetErrorStringWithFormat ("Couldn't read %s from the target: %s", reg_info.name, read_error.AsCString());
             return false;
         }
         
@@ -1801,7 +1799,7 @@
     }
     Error err;
     
-    if (!var_location_expr.Evaluate(&exe_ctx, ast, NULL, loclist_base_load_addr, NULL, *var_location.get(), &err))
+    if (!var_location_expr.Evaluate(&exe_ctx, ast, NULL, NULL, NULL, loclist_base_load_addr, NULL, *var_location.get(), &err))
     {
         if (log)
             log->Printf("Error evaluating location: %s", err.AsCString());