summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-01-16 12:53:11 -0600
committerElliott Hughes2014-01-16 14:54:18 -0600
commitccecf1425412beb2bc3bb38d470293fdc244d6f1 (patch)
tree9fd922197bc88bed453efa0738f3dfb5d6db4c3c /libdiskconfig
parente847f429f43ae56aaa406697ca603c8469e2100b (diff)
downloadplatform-system-core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.gz
platform-system-core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.xz
platform-system-core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.zip
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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c
index d5425de03..6fd81b714 100644
--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -19,6 +19,7 @@
19 19
20#include <errno.h> 20#include <errno.h>
21#include <fcntl.h> 21#include <fcntl.h>
22#include <inttypes.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <stdlib.h> 24#include <stdlib.h>
24#include <string.h> 25#include <string.h>
@@ -80,7 +81,7 @@ parse_len(const char *str, uint64_t *plen)
80 *plen *= multiple; 81 *plen *= multiple;
81 82
82 if (*plen > 0xffffffffULL) { 83 if (*plen > 0xffffffffULL) {
83 ALOGE("Length specified is too large!: %llu KB", *plen); 84 ALOGE("Length specified is too large!: %"PRIu64" KB", *plen);
84 return 1; 85 return 1;
85 } 86 }
86 } 87 }
@@ -371,8 +372,8 @@ validate(struct disk_info *dinfo)
371 372
372 /* only matters for disks, not files */ 373 /* only matters for disks, not files */
373 if (S_ISBLK(stat.st_mode) && total_size > disk_size) { 374 if (S_ISBLK(stat.st_mode) && total_size > disk_size) {
374 ALOGE("Total requested size of partitions (%llu) is greater than disk " 375 ALOGE("Total requested size of partitions (%"PRIu64") is greater than disk "
375 "size (%llu).", total_size, disk_size); 376 "size (%"PRIu64").", total_size, disk_size);
376 goto fail; 377 goto fail;
377 } 378 }
378 379