commit fa9caec7901723092e92ec8b0656824f507bfa7d
author Marek Behún <marek.behun@nic.cz> Fri Sep 24 23:07:00 2021 +0200
committer Stefan Roese <sr@denx.de> Fri Oct 01 11:07:13 2021 +0200
tree 800607f475ed5aeb5328af94bed3234c3ab2bbf5
parent 398d4153722f391c187bb8b7d39cb36171e33728

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>

tools/kwbimage.c

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 16b082b..944a108 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -282,7 +282,7 @@
 
 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 @@
 
 	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 @@
 		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 @@
 			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;

tools/kwbimage.h

diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index a09dbf1..6439776 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -229,7 +229,7 @@
  * 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 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;

tools/kwboot.c

diff --git a/tools/kwboot.c b/tools/kwboot.c
index b1dcd37..e47bf94 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -583,7 +583,7 @@
 	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 @@
 		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;