diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-17 20:49:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-17 20:49:25 +0000 |
| commit | 865bb05dd0db1531f252de5e137605beec171ca2 (patch) | |
| tree | 80bbbfbbb23f8e5aa230c33711aeb0368041d1ea | |
| parent | 5f8d9c012cf28fad57d0896b938b05e2c976073f (diff) | |
| parent | d9a1430ff2b2d2a52b586dfba1db5ac0128dd85b (diff) | |
| download | system_core-865bb05dd0db1531f252de5e137605beec171ca2.zip system_core-865bb05dd0db1531f252de5e137605beec171ca2.tar.gz system_core-865bb05dd0db1531f252de5e137605beec171ca2.tar.bz2 | |
Merge "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) |