From: Sean Callanan <scallanan@apple.com>
Date: Mon, 19 Sep 2016 22:06:12 +0000 (+0000)
Subject: Fixed the build by changing a couple of const char *s to StringRefs.
X-Git-Tag: llvmorg-4.0.0-rc1~9360
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1355f4735d3c24e665c9a83c15970f929ee165a1;p=platform%2Fupstream%2Fllvm.git

Fixed the build by changing a couple of const char *s to StringRefs.

llvm-svn: 281943
---

diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm
index c1b8f6e..9fd7233 100644
--- a/lldb/source/Host/macosx/Host.mm
+++ b/lldb/source/Host/macosx/Host.mm
@@ -806,7 +806,7 @@ static bool GetMacOSXProcessArgs(const ProcessInstanceInfoMatch *match_info_ptr,
           for (int i = 0; i < static_cast<int>(argc); ++i) {
             cstr = data.GetCStr(&offset);
             if (cstr)
-              proc_args.AppendArgument(cstr);
+              proc_args.AppendArgument(llvm::StringRef(cstr));
           }
 
           Args &proc_env = process_info.GetEnvironmentEntries();
@@ -824,7 +824,7 @@ static bool GetMacOSXProcessArgs(const ProcessInstanceInfoMatch *match_info_ptr,
                     llvm::Triple::MacOSX);
             }
 
-            proc_env.AppendArgument(cstr);
+            proc_env.AppendArgument(llvm::StringRef(cstr));
           }
           return true;
         }
@@ -1379,7 +1379,8 @@ Error Host::ShellExpandArguments(ProcessLaunchInfo &launch_info) {
       if (!str_sp)
         continue;
 
-      launch_info.GetArguments().AppendArgument(str_sp->GetValue().c_str());
+      launch_info.GetArguments().AppendArgument(
+          llvm::StringRef(str_sp->GetValue().c_str()));
     }
   }
 
diff --git a/lldb/source/Host/macosx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/HostInfoMacOSX.mm
index b79332d..9997928 100644
--- a/lldb/source/Host/macosx/HostInfoMacOSX.mm
+++ b/lldb/source/Host/macosx/HostInfoMacOSX.mm
@@ -88,7 +88,8 @@ bool HostInfoMacOSX::GetOSVersion(uint32_t &major, uint32_t &minor,
       NSString *version_value = [version_info objectForKey:@"ProductVersion"];
       const char *version_str = [version_value UTF8String];
       if (version_str)
-        Args::StringToVersion(version_str, g_major, g_minor, g_update);
+        Args::StringToVersion(llvm::StringRef(version_str), g_major, g_minor,
+                              g_update);
     }
   }
 
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index 14c64f2..2c0a5e0 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -1123,8 +1123,9 @@ Error GDBRemoteCommunication::StartDebugserverProcess(
                         __FUNCTION__, error.AsCString());
           return error;
         }
-        debugserver_args.AppendArgument("--named-pipe");
-        debugserver_args.AppendArgument(named_pipe_path.c_str());
+        debugserver_args.AppendArgument(llvm::StringRef("--named-pipe"));
+        debugserver_args.AppendArgument(
+            llvm::StringRef(named_pipe_path.c_str()));
 #else
         // Binding to port zero, we need to figure out what port it ends up
         // using using an unnamed pipe...
@@ -1191,7 +1192,7 @@ Error GDBRemoteCommunication::StartDebugserverProcess(
     if (env_debugserver_log_flags) {
       ::snprintf(arg_cstr, sizeof(arg_cstr), "--log-flags=%s",
                  env_debugserver_log_flags);
-      debugserver_args.AppendArgument(arg_cstr);
+      debugserver_args.AppendArgument(llvm::StringRef(arg_cstr));
     }
 #else
     const char *env_debugserver_log_channels =