diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-17 13:58:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 13:58:25 -0700 |
| commit | 88411498b3341dbf8f2976991524b1e21dedc6f6 (patch) | |
| tree | 035af05e64aaa03d3a022087c72a3054abc1e7ea | |
| parent | 1aeefcd6900d85911028e6d3e344e338e0a05158 (diff) | |
| parent | 520f4f060325496741f600692f3582536fa43a8f (diff) | |
| download | system_core-88411498b3341dbf8f2976991524b1e21dedc6f6.zip system_core-88411498b3341dbf8f2976991524b1e21dedc6f6.tar.gz system_core-88411498b3341dbf8f2976991524b1e21dedc6f6.tar.bz2 | |
am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"
* commit '520f4f060325496741f600692f3582536fa43a8f':
adb: fix reported transfer size for transfer over 4 GiB
| -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 64e393c..354d0fb 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) |