diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-16 10:53:11 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-16 12:54:18 -0800 |
| commit | ccecf1425412beb2bc3bb38d470293fdc244d6f1 (patch) | |
| tree | 9fd922197bc88bed453efa0738f3dfb5d6db4c3c /libdiskconfig | |
| parent | e847f429f43ae56aaa406697ca603c8469e2100b (diff) | |
| download | system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.zip system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.gz system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.bz2 | |
system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
Diffstat (limited to 'libdiskconfig')
| -rw-r--r-- | libdiskconfig/diskconfig.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |