diff options
Diffstat (limited to 'lldb/source/Core')
-rw-r--r-- | lldb/source/Core/Communication.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Core/DataBufferMemoryMap.cpp | 6 | ||||
-rw-r--r-- | lldb/source/Core/FormatManager.cpp | 10 | ||||
-rw-r--r-- | lldb/source/Core/StreamCallback.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index 64cc2f97ebd..0c7a8901f6f 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -208,7 +208,7 @@ Communication::Write (const void *src, size_t src_len, ConnectionStatus &status, { lldb::ConnectionSP connection_sp (m_connection_sp); - Mutex::Locker (m_write_mutex); + Mutex::Locker locker(m_write_mutex); lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION, "%p Communication::Write (src = %p, src_len = %llu) connection = %p", this, diff --git a/lldb/source/Core/DataBufferMemoryMap.cpp b/lldb/source/Core/DataBufferMemoryMap.cpp index 1668b566162..8f9b56d3539 100644 --- a/lldb/source/Core/DataBufferMemoryMap.cpp +++ b/lldb/source/Core/DataBufferMemoryMap.cpp @@ -97,15 +97,15 @@ DataBufferMemoryMap::Clear() // offset. //---------------------------------------------------------------------- size_t -DataBufferMemoryMap::MemoryMapFromFileSpec (const FileSpec* file, +DataBufferMemoryMap::MemoryMapFromFileSpec (const FileSpec* filespec, off_t offset, size_t length, bool writeable) { - if (file != NULL) + if (filespec != NULL) { char path[PATH_MAX]; - if (file->GetPath(path, sizeof(path))) + if (filespec->GetPath(path, sizeof(path))) { uint32_t options = File::eOpenOptionRead; if (writeable) diff --git a/lldb/source/Core/FormatManager.cpp b/lldb/source/Core/FormatManager.cpp index ef0e719a428..deb1169eb99 100644 --- a/lldb/source/Core/FormatManager.cpp +++ b/lldb/source/Core/FormatManager.cpp @@ -413,7 +413,7 @@ CategoryMap::AnyMatches (ConstString type_name, const char** matching_category, TypeCategoryImpl::FormatCategoryItems* matching_type) { - Mutex::Locker(m_map_mutex); + Mutex::Locker locker(m_map_mutex); MapIterator pos, end = m_map.end(); for (pos = m_map.begin(); pos != end; pos++) @@ -432,7 +432,7 @@ lldb::TypeSummaryImplSP CategoryMap::GetSummaryFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic) { - Mutex::Locker(m_map_mutex); + Mutex::Locker locker(m_map_mutex); uint32_t reason_why; ActiveCategoriesIterator begin, end = m_active_categories.end(); @@ -548,7 +548,7 @@ lldb::SyntheticChildrenSP CategoryMap::GetSyntheticChildren (ValueObject& valobj, lldb::DynamicValueType use_dynamic) { - Mutex::Locker(m_map_mutex); + Mutex::Locker locker(m_map_mutex); uint32_t reason_why; @@ -571,7 +571,7 @@ CategoryMap::LoopThrough(CallbackType callback, void* param) { if (callback) { - Mutex::Locker(m_map_mutex); + Mutex::Locker locker(m_map_mutex); // loop through enabled categories in respective order { @@ -603,7 +603,7 @@ CategoryMap::LoopThrough(CallbackType callback, void* param) TypeCategoryImplSP CategoryMap::GetAtIndex (uint32_t index) { - Mutex::Locker(m_map_mutex); + Mutex::Locker locker(m_map_mutex); if (index < m_map.size()) { diff --git a/lldb/source/Core/StreamCallback.cpp b/lldb/source/Core/StreamCallback.cpp index edce04e8ed8..63f3c9f8b2d 100644 --- a/lldb/source/Core/StreamCallback.cpp +++ b/lldb/source/Core/StreamCallback.cpp @@ -35,7 +35,7 @@ StreamCallback::~StreamCallback () StreamString & StreamCallback::FindStreamForThread(lldb::tid_t cur_tid) { - Mutex::Locker (m_collection_mutex); + Mutex::Locker locker(m_collection_mutex); collection::iterator iter = m_accumulated_data.find (cur_tid); if (iter == m_accumulated_data.end()) { |