diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-17 14:00:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 14:00:17 -0700 |
| commit | e39057b68798807f67179baac8bc61860fa1ab7a (patch) | |
| tree | 792cfdd2573ab0576306f59a104878f0ddc04c9c /adb | |
| parent | 8df29c9b61be76c786100d36194b54a871d604f0 (diff) | |
| parent | 88411498b3341dbf8f2976991524b1e21dedc6f6 (diff) | |
| download | core-e39057b68798807f67179baac8bc61860fa1ab7a.tar.gz core-e39057b68798807f67179baac8bc61860fa1ab7a.tar.bz2 core-e39057b68798807f67179baac8bc61860fa1ab7a.zip | |
am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"
* commit '88411498b3341dbf8f2976991524b1e21dedc6f6':
adb: fix reported transfer size for transfer over 4 GiB
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/file_sync_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/file_sync_client.c b/adb/file_sync_client.c index 64e393cc8..354d0fb33 100644 --- a/adb/file_sync_client.c +++ b/adb/file_sync_client.c @@ -32,7 +32,7 @@ #include "file_sync_service.h" -static unsigned total_bytes; +static unsigned long long total_bytes; static long long start_time; static long long NOW() @@ -58,8 +58,8 @@ static void END() t = 1000000; fprintf(stderr,"%lld KB/s (%lld bytes in %lld.%03llds)\n", - ((((long long) total_bytes) * 1000000LL) / t) / 1024LL, - (long long) total_bytes, (t / 1000000LL), (t % 1000000LL) / 1000LL); + ((total_bytes * 1000000LL) / t) / 1024LL, + total_bytes, (t / 1000000LL), (t % 1000000LL) / 1000LL); } void sync_quit(int fd) |