diff options
Diffstat (limited to 'libdiskconfig')
| -rw-r--r-- | libdiskconfig/config_mbr.c | 2 | ||||
| -rw-r--r-- | libdiskconfig/diskconfig.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c index b89d382..7641b29 100644 --- a/libdiskconfig/config_mbr.c +++ b/libdiskconfig/config_mbr.c @@ -88,7 +88,7 @@ mk_pri_pentry(struct disk_info *dinfo, struct part_info *pinfo, int pnum, /* DO NOT DEREFERENCE */ struct pc_boot_record *mbr = (void *)PC_MBR_DISK_OFFSET; /* grab the offset in mbr where to write this partition entry. */ - item->offset = (loff_t)((uint32_t)((uint8_t *)(&mbr->ptable[pnum]))); + item->offset = (loff_t)((uintptr_t)((uint8_t *)(&mbr->ptable[pnum]))); } pentry = (struct pc_partition *) &item->data; diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c index d5425de..6fd81b7 100644 --- a/libdiskconfig/diskconfig.c +++ b/libdiskconfig/diskconfig.c @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -80,7 +81,7 @@ parse_len(const char *str, uint64_t *plen) *plen *= multiple; if (*plen > 0xffffffffULL) { - ALOGE("Length specified is too large!: %llu KB", *plen); + ALOGE("Length specified is too large!: %"PRIu64" KB", *plen); return 1; } } @@ -371,8 +372,8 @@ validate(struct disk_info *dinfo) /* only matters for disks, not files */ if (S_ISBLK(stat.st_mode) && total_size > disk_size) { - ALOGE("Total requested size of partitions (%llu) is greater than disk " - "size (%llu).", total_size, disk_size); + ALOGE("Total requested size of partitions (%"PRIu64") is greater than disk " + "size (%"PRIu64").", total_size, disk_size); goto fail; } |