[Lldb-commits] [lldb] r226957 - Renamed UpdateSDKDirectoryInfosInNeeded->IfNeeded

Vince Harron vharron at google.com
Fri Jan 23 14:50:34 PST 2015


Author: vharron
Date: Fri Jan 23 16:50:34 2015
New Revision: 226957

URL: http://llvm.org/viewvc/llvm-project?rev=226957&view=rev
Log:
Renamed UpdateSDKDirectoryInfosInNeeded->IfNeeded

Also removed extra call to UpdateSDKDirectoryInfosIfNeeded


Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=226957&r1=226956&r2=226957&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Fri Jan 23 16:50:34 2015
@@ -296,7 +296,7 @@ PlatformRemoteiOS::GetContainedFilesInto
 }
 
 bool
-PlatformRemoteiOS::UpdateSDKDirectoryInfosInNeeded()
+PlatformRemoteiOS::UpdateSDKDirectoryInfosIfNeeded()
 {
     if (m_sdk_directory_infos.empty())
     {
@@ -358,7 +358,7 @@ const PlatformRemoteiOS::SDKDirectoryInf
 PlatformRemoteiOS::GetSDKDirectoryForCurrentOSVersion ()
 {
     uint32_t i;
-    if (UpdateSDKDirectoryInfosInNeeded())
+    if (UpdateSDKDirectoryInfosIfNeeded())
     {
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
 
@@ -377,7 +377,7 @@ PlatformRemoteiOS::GetSDKDirectoryForCur
         uint32_t major, minor, update;
         if (GetOSVersion(major, minor, update))
         {
-            if (UpdateSDKDirectoryInfosInNeeded())
+            if (UpdateSDKDirectoryInfosIfNeeded())
             {
                 // First try for an exact match of major, minor and update
                 for (i=0; i<num_sdk_infos; ++i)
@@ -432,7 +432,7 @@ const PlatformRemoteiOS::SDKDirectoryInf
 PlatformRemoteiOS::GetSDKDirectoryForLatestOSVersion ()
 {
     const PlatformRemoteiOS::SDKDirectoryInfo *result = NULL;
-    if (UpdateSDKDirectoryInfosInNeeded())
+    if (UpdateSDKDirectoryInfosIfNeeded())
     {
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
         // First try for an exact match of major, minor and update
@@ -533,7 +533,7 @@ uint32_t
 PlatformRemoteiOS::FindFileInAllSDKs (const char *platform_file_path,
                                       FileSpecList &file_list)
 {
-    if (platform_file_path && platform_file_path[0] && UpdateSDKDirectoryInfosInNeeded())
+    if (platform_file_path && platform_file_path[0] && UpdateSDKDirectoryInfosIfNeeded())
     {
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
         lldb_private::FileSpec local_file;
@@ -698,9 +698,8 @@ PlatformRemoteiOS::GetSharedModule (cons
     if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path)))
     {
         ModuleSpec platform_module_spec(module_spec);
-        UpdateSDKDirectoryInfosInNeeded();
 
-        UpdateSDKDirectoryInfosInNeeded();
+        UpdateSDKDirectoryInfosIfNeeded();
 
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
 

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h?rev=226957&r1=226956&r2=226957&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h Fri Jan 23 16:50:34 2015
@@ -122,7 +122,7 @@ protected:
     uint32_t m_connected_module_sdk_idx;
 
     bool
-    UpdateSDKDirectoryInfosInNeeded();
+    UpdateSDKDirectoryInfosIfNeeded();
 
     const char *
     GetDeviceSupportDirectory();





More information about the lldb-commits mailing list