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
This commit is contained in:
Elliott Hughes 2013-06-17 14:00:17 -07:00 committed by Android Git Automerger
commit e39057b687
1 changed files with 3 additions and 3 deletions

View File

@ -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)