[Lldb-commits] [lldb] r108029 - in /lldb/trunk: source/API/SBThread.cpp source/Core/Communication.cpp source/Plugins/SymbolFile/DWARF/DWARFFormValue.h tools/driver/IOChannel.cpp

[Eli Friedman]

Author: efriedma
Date: Fri Jul  9 17:53:18 2010
New Revision: 108029

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


Modified:
    lldb/trunk/source/API/SBThread.cpp
    lldb/trunk/source/Core/Communication.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
    lldb/trunk/tools/driver/IOChannel.cpp

Modified: lldb/trunk/source/API/SBThread.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBThread.cpp?rev=108029&r1=108028&r2=108029&view=diff
==============================================================================
--- lldb/trunk/source/API/SBThread.cpp (original)
+++ lldb/trunk/source/API/SBThread.cpp Fri Jul  9 17:53:18 2010
@@ -280,7 +280,7 @@
                        "     frame #%u: tid = 0x%4.4x, pc = 0x%llx ",
                        frame_idx,
                        GetThreadID(),
-                       pc);
+                       (long long)pc);
             sc->DumpStopContext (&str, &m_opaque_sp->GetProcess(), *frame.GetPCAddress());
             fprintf (out, "\n");
             success = true;

Modified: lldb/trunk/source/Core/Communication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Communication.cpp?rev=108029&r1=108028&r2=108029&view=diff
==============================================================================
--- lldb/trunk/source/Core/Communication.cpp (original)
+++ lldb/trunk/source/Core/Communication.cpp Fri Jul  9 17:53:18 2010
@@ -28,7 +28,7 @@
 Communication::Communication(const char *name) :
     Broadcaster (name),
     m_connection_ap (),
-    m_read_thread (NULL),
+    m_read_thread (LLDB_INVALID_HOST_THREAD),
     m_read_thread_enabled (false),
     m_bytes(),
     m_bytes_mutex (Mutex::eMutexTypeRecursive),
@@ -120,7 +120,7 @@
                                  "%p Communication::Write (dst = %p, dst_len = %zu, timeout_usec = %u) connection = %p",
                                  this, dst, dst_len, timeout_usec, m_connection_ap.get());
 
-    if (m_read_thread != NULL)
+    if (m_read_thread != LLDB_INVALID_HOST_THREAD)
     {
         // We have a dedicated read thread that is getting data for us
         size_t cached_bytes = GetCachedBytes (dst, dst_len);
@@ -219,7 +219,7 @@
 bool
 Communication::StopReadThread (Error *error_ptr)
 {
-    if (m_read_thread == NULL)
+    if (m_read_thread == LLDB_INVALID_HOST_THREAD)
         return true;
 
     lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
@@ -290,7 +290,7 @@
 bool
 Communication::ReadThreadIsRunning ()
 {
-    return m_read_thread != NULL;
+    return m_read_thread != LLDB_INVALID_HOST_THREAD;
 }
 
 void *

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h?rev=108029&r1=108028&r2=108029&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h Fri Jul  9 17:53:18 2010
@@ -24,8 +24,8 @@
     typedef struct ValueTypeTag
     {
         ValueTypeTag() :
-            data(NULL),
-            value()
+            value(),
+            data(NULL)
         {
             value.uval = 0;
         }

Modified: lldb/trunk/tools/driver/IOChannel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/IOChannel.cpp?rev=108029&r1=108028&r2=108029&view=diff
==============================================================================
--- lldb/trunk/tools/driver/IOChannel.cpp (original)
+++ lldb/trunk/tools/driver/IOChannel.cpp Fri Jul  9 17:53:18 2010
@@ -381,7 +381,7 @@
 bool
 IOChannel::Stop ()
 {
-    if (m_read_thread == NULL)
+    if (m_read_thread == LLDB_INVALID_HOST_THREAD)
         return true;
 
     BroadcastEventByType (eBroadcastBitThreadShouldExit);