Re: [Lldb-commits] [PATCH] D13293: Trim the output of mktem in PlatformAndroid::DownloadSymbolFile

[Tamas Berghammer via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL248998: Trim the output of mktem in 
PlatformAndroid::DownloadSymbolFile (authored by tberghammer).

Changed prior to commit:
  http://reviews.llvm.org/D13293?vs=36111&id=36209#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D13293

Files:
  lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp

Index: lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
===================================================================
--- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
@@ -331,7 +331,7 @@
     Error error = adb.Shell("mktemp --directory --tmpdir /data/local/tmp", 
5000 /* ms */, &tmpdir);
     if (error.Fail() || tmpdir.empty())
         return Error("Failed to generate temporary directory on the device 
(%s)", error.AsCString());
-    tmpdir.erase(tmpdir.size() - 1); // Remove trailing new line
+    tmpdir = llvm::StringRef(tmpdir).trim().str();
 
     // Create file remover for the temporary directory created on the device
     std::unique_ptr<std::string, std::function<void(std::string*)>> 
tmpdir_remover(



Index: lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
===================================================================
--- lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp
@@ -331,7 +331,7 @@
     Error error = adb.Shell("mktemp --directory --tmpdir /data/local/tmp", 5000 /* ms */, &tmpdir);
     if (error.Fail() || tmpdir.empty())
         return Error("Failed to generate temporary directory on the device (%s)", error.AsCString());
-    tmpdir.erase(tmpdir.size() - 1); // Remove trailing new line
+    tmpdir = llvm::StringRef(tmpdir).trim().str();
 
     // Create file remover for the temporary directory created on the device
     std::unique_ptr<std::string, std::function<void(std::string*)>> tmpdir_remover(

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits