Merge "adb: don't use adb_dirname in between getting and printing errno."

This commit is contained in:
Josh Gao 2015-11-18 00:44:05 +00:00 committed by Gerrit Code Review
commit 44901f1147

View file

@ -403,9 +403,9 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath)
if (!sc.SendRequest(ID_RECV, rpath)) return false; if (!sc.SendRequest(ID_RECV, rpath)) return false;
adb_unlink(lpath); adb_unlink(lpath);
if (!mkdirs(adb_dirname(lpath))) { const std::string dirpath = adb_dirname(lpath);
sc.Error("failed to create parent directory '%s': %s", if (!mkdirs(dirpath.c_str())) {
adb_dirname(lpath).c_str(), strerror(errno)); sc.Error("failed to create parent directory '%s': %s", dirpath.c_str(), strerror(errno));
return false; return false;
} }