Skip to contentSkip to conversation

FIT: delete unnecessary casts

PATCH New Masahiro Yamada 4 participants 4 messages Sep 19, 2013 – Sep 21, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 FIT: delete unnecessary casts

Becuase fdt_check_header function takes (const void *) type argument, the argument should be passed to it without being casted to (char *).

---

Changes for v2:
- fix commit log (purely cosmetic)
(s/img_addr/the argument/)

 common/image-fdt.c | 2 +-
 common/image-fit.c | 2 +-
 common/image.c     | 6 +-----
 tools/fit_image.c  | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)
common/image-fdt.c +1 -1
index 2e22cca..6f9ce7d 100644
@@ -55,7 +55,7 @@ static const image_header_t *image_get_fdt(ulong fdt_addr)
 		fdt_error("uImage is compressed");
 		return NULL;
 	}
-	if (fdt_check_header((char *)image_get_data(fdt_hdr)) != 0) {
+	if (fdt_check_header((void *)image_get_data(fdt_hdr)) != 0) {
 		fdt_error("uImage data is not a fdt");
 		return NULL;
 	}
common/image-fit.c +1 -1
index 1c2ef31..a657c13 100644
@@ -1596,7 +1596,7 @@ int fit_image_load(bootm_headers_t *images, const char *prop_name, ulong addr,
 	len = (ulong)size;
 
 	/* verify that image data is a proper FDT blob */
-	if (image_type == IH_TYPE_FLATDT && fdt_check_header((char *)buf)) {
+	if (image_type == IH_TYPE_FLATDT && fdt_check_header(buf)) {
 		puts("Subimage data is not a FDT");
 		return -ENOEXEC;
 	}
common/image.c +1 -5
index 2c88091..e0a4c12 100644
@@ -652,17 +652,13 @@ int genimg_get_format(const void *img_addr)
 {
 	ulong format = IMAGE_FORMAT_INVALID;
 	const image_header_t *hdr;
-#if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT)
-	char *fit_hdr;
-#endif
 
 	hdr = (const image_header_t *)img_addr;
 	if (image_check_magic(hdr))
 		format = IMAGE_FORMAT_LEGACY;
 #if defined(CONFIG_FIT) || defined(CONFIG_OF_LIBFDT)
 	else {
-		fit_hdr = (char *)img_addr;
-		if (fdt_check_header(fit_hdr) == 0)
+		if (fdt_check_header(img_addr) == 0)
 			format = IMAGE_FORMAT_FIT;
 	}
 #endif
tools/fit_image.c +1 -1
index 47beaaf..0400a60 100644
@@ -23,7 +23,7 @@ static image_header_t header;
 static int fit_verify_header (unsigned char *ptr, int image_size,
 			struct mkimage_params *params)
 {
-	return fdt_check_header ((void *)ptr);
+	return fdt_check_header(ptr);
 }
 
 static int fit_check_image_types (uint8_t type)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v2 1/1 FIT: delete unnecessary casts

Quoted 23 lines · Masahiro Yamada

Becuase fdt_check_header function takes (const void *) type argument, the argument should be passed to it without being casted to (char *).

---

Changes for v2:
- fix commit log (purely cosmetic)
(s/img_addr/the argument/)

  common/image-fdt.c | 2 +-
  common/image-fit.c | 2 +-
  common/image.c     | 6 +-----
  tools/fit_image.c  | 2 +-
  4 files changed, 4 insertions(+), 8 deletions(-)
common/image-fdt.c +0 -0
index 2e22cca..6f9ce7d 100644

common/image-fdt.c static const image_header_t *image_get_fdt(ulong fdt_addr) · line 61

Quoted 8 lines
common/image-fdt.c +1 -1
@@ -55,7 +55,7 @@ static const image_header_t *image_get_fdt(ulong fdt_addr)
  		fdt_error("uImage is compressed");
  		return NULL;
  	}
-	if (fdt_check_header((char *)image_get_data(fdt_hdr)) != 0) {
+	if (fdt_check_header((void *)image_get_data(fdt_hdr)) != 0) {
  		fdt_error("uImage data is not a fdt");
  		return NULL;
  	}

Not that I care, this is fine with me. Was just
wondering if this cast is needed at all. AFAIK
it is a cpp thing (and MSVC?) to require it.

Regards,
Jeroen

#3 lore raw

PATCH v2 1/1 FIT: delete unnecessary casts

In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

Becuase fdt_check_header function takes (const void *) type argument, the argument should be passed to it without being casted to (char *).

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130921/b1c6ab75/attachment.pgp>