commit 69f3ec84cf4e9a1bf4c222b88b4413da407331b5
author Colin Cross <ccross@android.com> Tue Mar 05 17:33:54 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 05 17:33:54 2013 +0000
tree 04ea92e3112628c3dadf11983302da04ab1b1372
parent 515bed0e6aae4a835ab4393499c7dd99941a8423
parent 86ae6d587b740c70d46e0633a92457454dee79fb

Merge "Fix issues where the filename is referred to as 'sideload'"

adb/commandline.c

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 @@
     }
 }
 
-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 @@
         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 @@
 
     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;
 }