openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

auto import from //depot/cupcake/@137055

This commit is contained in:
The Android Open Source Project 2009-03-02 22:54:47 -08:00
parent 3e292b9716
commit c2d26a164f
3 changed files with 6 additions and 7 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,9 +387,8 @@ mkdosfs_main(int argc, char *argv[])
exit(1);
}
lseek(fd1, 0, SEEK_SET);
off_t length = lseek(fd1, 0, SEEK_END);
fprintf(stderr, "lseek returned %ld\n", length);
lseek64(fd1, 0, SEEK_SET);
loff_t length = lseek64(fd1, 0, SEEK_END);
if (length > 0) {
bpb.bsec = length / bpb.bps;
bpb.spt = bpb.bsec;
@ -615,8 +614,8 @@ mkdosfs_main(int argc, char *argv[])
fat == 32 && bpb.bkbs != MAXU16 &&
bss <= bpb.bkbs && x >= bpb.bkbs) {
x -= bpb.bkbs;
if (!x && lseek(fd1, 0, SEEK_SET))
fprintf(stderr, "lseek failed for %s\n", bname);
if (!x && lseek64(fd1, 0, SEEK_SET))
fprintf(stderr, "lseek64 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,
((blk->nr_sec * 512) / 1024) / 1024);
(uint32_t) (((uint64_t) blk->nr_sec * 512) / 1024) / 1024);
if (blk->type == blkdev_disk)
sprintf(tmp2, " %d partitions", blk->nr_parts);