diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-30 13:44:10 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-05-05 10:30:04 -0700 |
| commit | cc209517e45346ea30d88ce9274dbb6ff1649914 (patch) | |
| tree | fab1f39d679b4499004da733954d079afdb4237d /mkbootimg | |
| parent | 1c00d46b2566e91be9268812dbb5d3abfea3c3a2 (diff) | |
| download | system_core-cc209517e45346ea30d88ce9274dbb6ff1649914.zip system_core-cc209517e45346ea30d88ce9274dbb6ff1649914.tar.gz system_core-cc209517e45346ea30d88ce9274dbb6ff1649914.tar.bz2 | |
mkbootimg: turn on -Werror
- Deal with signedness issues
Change-Id: I61211165eb4ce0fa9a2edeebb3f97fb0ffc62d34
Diffstat (limited to 'mkbootimg')
| -rw-r--r-- | mkbootimg/Android.mk | 1 | ||||
| -rw-r--r-- | mkbootimg/mkbootimg.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mkbootimg/Android.mk b/mkbootimg/Android.mk index 2a97c26..0c9b0c6 100644 --- a/mkbootimg/Android.mk +++ b/mkbootimg/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := mkbootimg.c LOCAL_STATIC_LIBRARIES := libmincrypt +LOCAL_CFLAGS := -Werror LOCAL_MODULE := mkbootimg diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c index a7daccc..fc92b4d 100644 --- a/mkbootimg/mkbootimg.c +++ b/mkbootimg/mkbootimg.c @@ -77,7 +77,7 @@ static unsigned char padding[16384] = { 0, }; int write_padding(int fd, unsigned pagesize, unsigned itemsize) { unsigned pagemask = pagesize - 1; - unsigned count; + ssize_t count; if((itemsize & pagemask) == 0) { return 0; @@ -108,7 +108,7 @@ int main(int argc, char **argv) unsigned pagesize = 2048; int fd; SHA_CTX ctx; - uint8_t* sha; + const uint8_t* sha; unsigned base = 0x10000000; unsigned kernel_offset = 0x00008000; unsigned ramdisk_offset = 0x01000000; @@ -189,7 +189,7 @@ int main(int argc, char **argv) return usage(); } - strcpy(hdr.name, board); + strcpy((char *) hdr.name, board); memcpy(hdr.magic, BOOT_MAGIC, BOOT_MAGIC_SIZE); @@ -255,14 +255,14 @@ int main(int argc, char **argv) if(write(fd, &hdr, sizeof(hdr)) != sizeof(hdr)) goto fail; if(write_padding(fd, pagesize, sizeof(hdr))) goto fail; - if(write(fd, kernel_data, hdr.kernel_size) != hdr.kernel_size) goto fail; + if(write(fd, kernel_data, hdr.kernel_size) != (ssize_t) hdr.kernel_size) goto fail; if(write_padding(fd, pagesize, hdr.kernel_size)) goto fail; - if(write(fd, ramdisk_data, hdr.ramdisk_size) != hdr.ramdisk_size) goto fail; + if(write(fd, ramdisk_data, hdr.ramdisk_size) != (ssize_t) hdr.ramdisk_size) goto fail; if(write_padding(fd, pagesize, hdr.ramdisk_size)) goto fail; if(second_data) { - if(write(fd, second_data, hdr.second_size) != hdr.second_size) goto fail; + if(write(fd, second_data, hdr.second_size) != (ssize_t) hdr.second_size) goto fail; if(write_padding(fd, pagesize, hdr.second_size)) goto fail; } |