[Lldb-commits] [lldb] r176879 - Misc. clang build warning fixes.

[Matt Kopec]

Author: mkopec
Date: Tue Mar 12 12:45:38 2013
New Revision: 176879

URL: http://llvm.org/viewvc/llvm-project?rev=176879&view=rev
Log:
Misc. clang build warning fixes.

Modified:
    lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
    lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
    lldb/trunk/source/Symbol/ClangASTImporter.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=176879&r1=176878&r2=176879&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Tue Mar 12 12:45:38 2013
@@ -2307,7 +2307,7 @@ ClangExpressionDeclMap::DoMaterializeOne
                     {
                         if (value_byte_size != value_data_extractor.GetByteSize())
                         {
-                            err.SetErrorStringWithFormat ("Size mismatch for %s: %llu versus %llu",
+                            err.SetErrorStringWithFormat ("Size mismatch for %s: %" PRIu64 " versus %" PRIu64,
                                                           name.GetCString(),
                                                           (uint64_t)value_data_extractor.GetByteSize(),
                                                           (uint64_t)value_byte_size);

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp?rev=176879&r1=176878&r2=176879&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Tue Mar 12 12:45:38 2013
@@ -386,7 +386,7 @@ DisassemblerLLVMC::LLVMCDisassembler::LL
     
     if (m_instr_info_ap.get() == NULL || m_reg_info_ap.get() == NULL || m_subtarget_info_ap.get() == NULL || m_asm_info_ap.get() == NULL)
     {
-        m_is_valid = NULL;
+        m_is_valid = false;
         return;
     }
     

Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp?rev=176879&r1=176878&r2=176879&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Tue Mar 12 12:45:38 2013
@@ -930,7 +930,7 @@ DynamicLoaderDarwinKernel::KextImageInfo
                 addr_t file_address = kernel_object_file->GetHeaderAddress().GetFileAddress();
                 if (m_load_address != LLDB_INVALID_ADDRESS && file_address != LLDB_INVALID_ADDRESS)
                 {
-                    s->Printf ("Kernel slid 0x%llx in memory.\n", m_load_address - file_address);
+                    s->Printf ("Kernel slid 0x%" PRIx64 " in memory.\n", m_load_address - file_address);
                 }
             }
             if (m_module_sp->GetFileSpec().GetDirectory().IsEmpty())

Modified: lldb/trunk/source/Symbol/ClangASTImporter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTImporter.cpp?rev=176879&r1=176878&r2=176879&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTImporter.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTImporter.cpp Tue Mar 12 12:45:38 2013
@@ -26,12 +26,12 @@ ClangASTMetrics::Counters ClangASTMetric
 
 void ClangASTMetrics::DumpCounters (lldb::LogSP log, ClangASTMetrics::Counters &counters)
 {
-    log->Printf("  Number of visible Decl queries by name     : %llu", counters.m_visible_query_count);
-    log->Printf("  Number of lexical Decl queries             : %llu", counters.m_lexical_query_count);
-    log->Printf("  Number of imports initiated by LLDB        : %llu", counters.m_lldb_import_count);
-    log->Printf("  Number of imports conducted by Clang       : %llu", counters.m_clang_import_count);
-    log->Printf("  Number of Decls completed                  : %llu", counters.m_decls_completed_count);
-    log->Printf("  Number of records laid out                 : %llu", counters.m_record_layout_count);
+    log->Printf("  Number of visible Decl queries by name     : %" PRIu64, counters.m_visible_query_count);
+    log->Printf("  Number of lexical Decl queries             : %" PRIu64, counters.m_lexical_query_count);
+    log->Printf("  Number of imports initiated by LLDB        : %" PRIu64, counters.m_lldb_import_count);
+    log->Printf("  Number of imports conducted by Clang       : %" PRIu64, counters.m_clang_import_count);
+    log->Printf("  Number of Decls completed                  : %" PRIu64, counters.m_decls_completed_count);
+    log->Printf("  Number of records laid out                 : %" PRIu64, counters.m_record_layout_count);
 }
 
 void ClangASTMetrics::DumpCounters (lldb::LogSP log)