diff options
| author | Colin Cross <ccross@android.com> | 2013-03-05 18:52:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-05 18:52:29 +0000 |
| commit | 95b087fa90c89b21d18268c84167d1407f9e7905 (patch) | |
| tree | e4612b1b7c054befbde99f8f378784902b8519c6 | |
| parent | 7c646cd3594283bc4aaf53a0b10143a76281270f (diff) | |
| parent | 79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6 (diff) | |
| download | system_core-95b087fa90c89b21d18268c84167d1407f9e7905.zip system_core-95b087fa90c89b21d18268c84167d1407f9e7905.tar.gz system_core-95b087fa90c89b21d18268c84167d1407f9e7905.tar.bz2 | |
am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"
* commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6':
Fix issues where the filename is referred to as 'sideload'
| -rw-r--r-- | adb/commandline.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index cbe4616..a927423 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -383,7 +383,7 @@ static void format_host_command(char* buffer, size_t buflen, const char* comman } } -int adb_download_buffer(const char *service, const void* data, int sz, +int adb_download_buffer(const char *service, const char *fn, const void* data, int sz, unsigned progress) { char buf[4096]; @@ -419,7 +419,7 @@ int adb_download_buffer(const char *service, const void* data, int sz, sz -= xfer; ptr += xfer; if(progress) { - printf("sending: '%s' %4d%% \r", service, (int)(100LL - ((100LL * sz) / (total)))); + printf("sending: '%s' %4d%% \r", fn, (int)(100LL - ((100LL * sz) / (total)))); fflush(stdout); } } @@ -451,11 +451,11 @@ int adb_download(const char *service, const char *fn, unsigned progress) data = load_file(fn, &sz); if(data == 0) { - fprintf(stderr,"* cannot read '%s' *\n", service); + fprintf(stderr,"* cannot read '%s' *\n", fn); return -1; } - int status = adb_download_buffer(service, data, sz, progress); + int status = adb_download_buffer(service, fn, data, sz, progress); free(data); return status; } |