Reduce code duplication.

This also moves strlen out of the mutex scope.

llvm-svn: 106545

1 files changed, 3 insertions, 17 deletions

diff --git a/lldb/source/Core/ConstString.cpp b/lldb/source/Core/ConstString.cpp
index c2d09c76461..06d83829fae 100644
--- a/lldb/source/Core/ConstString.cpp
+++ b/lldb/source/Core/ConstString.cpp
@@ -73,15 +73,7 @@ public:
     GetConstCString (const char *cstr)
     {
         if (cstr)
-        {
-            Mutex::Locker locker (m_mutex);
-            llvm::StringRef string_ref (cstr);
-            llvm::StringMapEntry<uint32_t>& entry = m_string_map.GetOrCreateValue (string_ref);
-            const char *ccstr = entry.getKeyData();
-            llvm::StringMapEntry<uint32_t>&reconstituted_entry = GetStringMapEntryFromKeyData (ccstr);
-            assert (&entry == &reconstituted_entry);
-            return ccstr;
-        }
+            return GetConstCStringWithLength (cstr, strlen (cstr));
         return NULL;
     }
 
@@ -106,14 +98,8 @@ public:
     {
         if (cstr)
         {
-            Mutex::Locker locker (m_mutex);
-            int actual_cstr_len = strlen (cstr);
-            llvm::StringRef string_ref (cstr, std::min<int>(actual_cstr_len, cstr_len));
-            llvm::StringMapEntry<uint32_t>& entry = m_string_map.GetOrCreateValue (string_ref);
-            const char *ccstr = entry.getKeyData();
-            llvm::StringMapEntry<uint32_t>&reconstituted_entry = GetStringMapEntryFromKeyData (ccstr);
-            assert (&entry == &reconstituted_entry);
-            return ccstr;
+            int trimmed_len = std::min<int> (strlen (cstr), cstr_len);
+            return GetConstCStringWithLength (cstr, trimmed_len);
         }
         return NULL;
     }