ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto import from //depot/cupcake/@132589

Browse source
This commit is contained in:
The Android Open Source Project 2009-03-03 14:04:41 -08:00
parent c2d26a164f
commit a1e1c1b106
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
logcat/event-log-tags
View file

@ -343,4 +343,4 @@
# browser stats for diary study
70101 browser_zoom_level_change (start level|1|5),(end level|1|5),(time|2|3)
70102 browser_double_tap_duration (duration|1|3),(time|2|3)
70102 browser_double_tap_duration (duration|1|3),(time|2|3)

9
toolbox/mkdosfs.c
View file

@ -387,8 +387,9 @@ mkdosfs_main(int argc, char *argv[])
exit(1);
}
lseek64(fd1, 0, SEEK_SET);
loff_t length = lseek64(fd1, 0, SEEK_END);
lseek(fd1, 0, SEEK_SET);
off_t length = lseek(fd1, 0, SEEK_END);
fprintf(stderr, "lseek returned %ld\n", length);
if (length > 0) {
bpb.bsec = length / bpb.bps;
bpb.spt = bpb.bsec;
@ -614,8 +615,8 @@ mkdosfs_main(int argc, char *argv[])
fat == 32 && bpb.bkbs != MAXU16 &&
bss <= bpb.bkbs && x >= bpb.bkbs) {
x -= bpb.bkbs;
if (!x && lseek64(fd1, 0, SEEK_SET))
fprintf(stderr, "lseek64 failed for %s\n", bname);
if (!x && lseek(fd1, 0, SEEK_SET))
fprintf(stderr, "lseek failed for %s\n", bname);
}
if (opt_B && x < bss) {
if ((n = read(fd1, img, bpb.bps)) == -1)

2
vold/blkdev.c
View file

@ -149,7 +149,7 @@ int blkdev_refresh(blkdev_t *blk)
(blk->type == blkdev_disk ? "Disk" : "Partition"),
blk->major, blk->minor,
blk->nr_sec,
(uint32_t) (((uint64_t) blk->nr_sec * 512) / 1024) / 1024);
((blk->nr_sec * 512) / 1024) / 1024);
if (blk->type == blkdev_disk)
sprintf(tmp2, " %d partitions", blk->nr_parts);