ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: Avoid a couple std::string constructions" am: 2442e64416

Browse source 
Change-Id: I6e89af8ee9133c03978f3fa543c0b777a5080402
This commit is contained in:
Automerger Merge Worker 2020-03-12 00:25:53 +00:00
commit c2d303231d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/client/file_sync_client.cpp
View file

@ -1097,14 +1097,14 @@ static bool remote_build_list(SyncConnection& sc, std::vector<copyinfo>* file_li
} }
}; };
if (!sync_ls(sc, rpath.c_str(), callback)) { if (!sync_ls(sc, rpath, callback)) {
return false; return false;
} }
// Check each symlink we found to see whether it's a file or directory. // Check each symlink we found to see whether it's a file or directory.
for (copyinfo& link_ci : linklist) { for (copyinfo& link_ci : linklist) {
struct stat st; struct stat st;
if (!sync_stat_fallback(sc, link_ci.rpath.c_str(), &st)) { if (!sync_stat_fallback(sc, link_ci.rpath, &st)) {
sc.Warning("stat failed for path %s: %s", link_ci.rpath.c_str(), strerror(errno)); sc.Warning("stat failed for path %s: %s", link_ci.rpath.c_str(), strerror(errno));
continue; continue;
} }