aboutsummaryrefslogtreecommitdiff
path: root/lldb/source/Plugins/Process/gdb-remote
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2011-01-25 23:55:37 +0000
committerGreg Clayton <gclayton@apple.com>2011-01-25 23:55:37 +0000
commit1a65ae11bd65d007391473f8bde3d06f4abad740 (patch)
tree12bcbcdd2564d2bf305c3642ebe3a0b80128beb7 /lldb/source/Plugins/Process/gdb-remote
parent3ae681eb1240f09af37936663760526ed1b324cf (diff)
downloadllvm-1a65ae11bd65d007391473f8bde3d06f4abad740.zip
llvm-1a65ae11bd65d007391473f8bde3d06f4abad740.tar.gz
llvm-1a65ae11bd65d007391473f8bde3d06f4abad740.tar.bz2
Enabled extra warnings and fixed a bunch of small issues.
llvm-svn: 124250
Diffstat (limited to 'lldb/source/Plugins/Process/gdb-remote')
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp10
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp5
2 files changed, 6 insertions, 9 deletions
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index d83fb58..6ec7dab 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -1098,13 +1098,13 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
gdb_thread->SetName (thread_name.empty() ? thread_name.c_str() : NULL);
if (exc_type != 0)
{
- const size_t exc_data_count = exc_data.size();
+ const size_t exc_data_size = exc_data.size();
gdb_thread->SetStopInfo (StopInfoMachException::CreateStopReasonWithMachException (*thread_sp,
exc_type,
- exc_data_count,
- exc_data_count >= 1 ? exc_data[0] : 0,
- exc_data_count >= 2 ? exc_data[1] : 0));
+ exc_data_size,
+ exc_data_size >= 1 ? exc_data[0] : 0,
+ exc_data_size >= 2 ? exc_data[1] : 0));
}
else if (signo)
{
@@ -1230,7 +1230,7 @@ ProcessGDBRemote::InterruptIfRunning
timeout_time.OffsetWithSeconds(5);
StateType state = WaitForStateChangedEventsPrivate (&timeout_time, stop_event_sp);
- const bool timed_out = state == eStateInvalid;
+ timed_out = state == eStateInvalid;
if (log)
log->Printf ("ProcessGDBRemote::InterruptIfRunning() catch stop event: state = %s, timed-out=%i", StateAsCString(state), timed_out);
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
index 044edd0..0c019bf 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
@@ -96,12 +96,10 @@ ProcessGDBRemoteLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, A
{
// Try see if there already is a log - that way we can reuse its settings.
// We could reuse the log in toto, but we don't know that the stream is the same.
- uint32_t flag_bits;
+ uint32_t flag_bits = 0;
LogSP log(GetLog ());
if (log)
flag_bits = log->GetMask().Get();
- else
- flag_bits = 0;
// Now make a new log with this stream if one was provided
if (log_stream_sp)
@@ -112,7 +110,6 @@ ProcessGDBRemoteLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, A
if (log)
{
- uint32_t flag_bits = 0;
bool got_unknown_category = false;
const size_t argc = args.GetArgumentCount();
for (size_t i=0; i<argc; ++i)