From d236d071b960a387f536712f0314b99696167178 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 21 Apr 2015 10:17:07 -0700 Subject: Fix "adb sync" for devices without vendor and oem. Bug: http://b/20440110 Change-Id: I2481992198890f5ca50412c2b7ca361101961413 --- adb/file_sync_client.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'adb/file_sync_client.cpp') diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp index 730a5e2432..49d87832f2 100644 --- a/adb/file_sync_client.cpp +++ b/adb/file_sync_client.cpp @@ -1027,18 +1027,18 @@ int do_sync_pull(const char *rpath, const char *lpath, int show_progress, int co } } -int do_sync_sync(const char *lpath, const char *rpath, int listonly) +int do_sync_sync(const std::string& lpath, const std::string& rpath, bool list_only) { - fprintf(stderr,"syncing %s...\n",rpath); + fprintf(stderr, "syncing %s...\n", rpath.c_str()); int fd = adb_connect("sync:"); - if(fd < 0) { - fprintf(stderr,"error: %s\n", adb_error()); + if (fd < 0) { + fprintf(stderr, "error: %s\n", adb_error()); return 1; } BEGIN(); - if(copy_local_dir_remote(fd, lpath, rpath, 1, listonly)){ + if (copy_local_dir_remote(fd, lpath.c_str(), rpath.c_str(), 1, list_only)) { return 1; } else { END(); -- cgit v1.2.3