Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc209517 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

mkbootimg: turn on -Werror 

- Deal with signedness issues

Change-Id: I61211165eb4ce0fa9a2edeebb3f97fb0ffc62d34
parent 1c00d46b

mkbootimg/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := mkbootimg.c

LOCAL_STATIC_LIBRARIES := libmincrypt

LOCAL_CFLAGS := -Werror



LOCAL_MODULE := mkbootimg

mkbootimg/mkbootimg.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

    }