tools: kwbimage: Refactor image_version()

Rename this function to kwbimage_version() and don't cast argument if
not needed.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 16b082b35f82789c5d63d2f4c83be71e880b4aa6..944a108cee8b286754062949188d64597bca1cd2 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -282,7 +282,7 @@ static uint8_t image_checksum8(void *start, uint32_t len)
 
 size_t kwbimage_header_size(unsigned char *ptr)
 {
-       if (image_version((void *)ptr) == 0)
+       if (kwbimage_version((void *)ptr) == 0)
                return sizeof(struct main_hdr_v0);
        else
                return KWBHEADER_V1_SIZE((struct main_hdr_v1 *)ptr);
@@ -1622,7 +1622,7 @@ static void kwbimage_print_header(const void *ptr)
 
        printf("Image Type:   MVEBU Boot from %s Image\n",
               image_boot_mode_name(mhdr->blockid));
-       printf("Image version:%d\n", image_version((void *)ptr));
+       printf("Image version:%d\n", kwbimage_version(ptr));
 
        for_each_opt_hdr_v1 (ohdr, mhdr) {
                if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
@@ -1659,7 +1659,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
                return -FDT_ERR_BADSTRUCTURE;
 
        /* Only version 0 extended header has checksum */
-       if (image_version((void *)ptr) == 0) {
+       if (kwbimage_version(ptr) == 0) {
                struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
 
                if (mhdr->ext & 0x1) {
@@ -1676,7 +1676,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
                        if (checksum != ext_hdr->checksum)
                                return -FDT_ERR_BADSTRUCTURE;
                }
-       } else if (image_version((void *)ptr) == 1) {
+       } else if (kwbimage_version(ptr) == 1) {
                struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
                const uint8_t *mhdr_end;
                struct opt_hdr_v1 *ohdr;

diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index a09dbf19adf07cac01fb013bcec07d0889fb8541..643977685a3471f8604b8c06a99d3c8733e6f1d8 100644 (file)
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -229,7 +229,7 @@ void init_kwb_image_type (void);
  * header, byte 8 was reserved, and always set to 0. In the v1 header,
  * byte 8 has been changed to a proper field, set to 1.
  */
-static inline unsigned int image_version(const void *header)
+static inline unsigned int kwbimage_version(const void *header)
 {
        const unsigned char *ptr = header;
        return ptr[8];
@@ -258,7 +258,7 @@ static inline int opt_hdr_v1_valid_size(const struct opt_hdr_v1 *ohdr,
 static inline struct opt_hdr_v1 *opt_hdr_v1_first(void *img) {
        struct main_hdr_v1 *mhdr;
 
-       if (image_version(img) != 1)
+       if (kwbimage_version(img) != 1)
                return NULL;
 
        mhdr = img;

diff --git a/tools/kwboot.c b/tools/kwboot.c
index b1dcd3796ce69fbcf0a39a01b58eea5ecc62ad67..e47bf94e8986e248f786c3d0c06353c6f86d7392 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -583,7 +583,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
        int rc, pnum;
        size_t hdrsz;
 
-       if (image_version(img) == 0)
+       if (kwbimage_version(img) == 0)
                hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
        else
                hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
@@ -787,7 +787,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
                goto out;
        }
 
-       image_ver = image_version(img);
+       image_ver = kwbimage_version(img);
        if (image_ver != 0 && image_ver != 1) {
                fprintf(stderr, "Invalid image header version\n");
                errno = EINVAL;