commit 64f508c4c6d17a1fa7c0dfafbfb535af723e0dfb
author Josh Gao <jmgao@google.com> Wed Nov 18 17:19:42 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 18 17:19:42 2015 +0000
tree 9f0f966d86e09a312a85615a4b878b992a491d00
parent c6dd51fe5f8965c02c6f3c79d055cbf28a2f10e5
parent 0a438b70ca0f2141934d3da835cae4dd013ffd5f

Merge "adb: don\'t use adb_dirname in between getting and printing errno." am: 44901f1147
am: 975c9a6863

* commit '975c9a68634149963c3bbd056823b5fe0e3310ea':
  adb: don't use adb_dirname in between getting and printing errno.

adb/file_sync_client.cpp

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index a2d2a66..ad38369 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -403,9 +403,9 @@
     if (!sc.SendRequest(ID_RECV, rpath)) return false;
 
     adb_unlink(lpath);
-    if (!mkdirs(adb_dirname(lpath))) {
-        sc.Error("failed to create parent directory '%s': %s",
-                 adb_dirname(lpath).c_str(), strerror(errno));
+    const std::string dirpath = adb_dirname(lpath);
+    if (!mkdirs(dirpath.c_str())) {
+        sc.Error("failed to create parent directory '%s': %s", dirpath.c_str(), strerror(errno));
         return false;
     }