tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Change-Id: I768760f4439b5403025bb3a91a8acedcf6fd4d47
This commit is contained in:
Automerger Merge Worker 2020-03-12 00:41:33 +00:00
commit 5dc6290c24
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;
}
// Check each symlink we found to see whether it's a file or directory.
for (copyinfo& link_ci : linklist) {
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));
continue;
}