summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-17 13:56:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-17 13:56:04 -0700
commit520f4f060325496741f600692f3582536fa43a8f (patch)
tree5b6125c137e79407e69686db1026d525eebb6424 /adb
parent0173ebd531b2b443b56d1c12d598f2f89c95fb0a (diff)
parent865bb05dd0db1531f252de5e137605beec171ca2 (diff)
downloadsystem_core-520f4f060325496741f600692f3582536fa43a8f.zip
system_core-520f4f060325496741f600692f3582536fa43a8f.tar.gz
system_core-520f4f060325496741f600692f3582536fa43a8f.tar.bz2
am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"
* commit '865bb05dd0db1531f252de5e137605beec171ca2': adb: fix reported transfer size for transfer over 4 GiB
Diffstat (limited to 'adb')
-rw-r--r--adb/file_sync_client.c6
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)