File 0026-uImage-use-char-instead-of-unsigned-char-f... of Package kexec-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch of Package kexec-tools (Revision 44768d86ade2e2cd60bcd5cc7282b144)

Currently displaying revision 44768d86ade2e2cd60bcd5cc7282b144 , Show latest

From a0c575793b86ebdcf7260ffc7ebbebb912e7ecf4 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw@amazon.co.uk>
Date: Wed, 8 Mar 2017 22:41:12 +0000
Subject: [PATCH 26/45] uImage: use 'char *' instead of 'unsigned char *' for
 uImage_probe()

... and friends. Again, PPC never cared about the difference, while
ARM had to add an explicit cast to work around it, which we can remove
now.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 include/kexec-uImage.h            |  6 +++---
 kexec/arch/arm/kexec-uImage-arm.c |  3 +--
 kexec/kexec-uImage.c              | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/kexec-uImage.h b/include/kexec-uImage.h
index 483b578adee1..983d63f7f420 100644
--- a/include/kexec-uImage.h
+++ b/include/kexec-uImage.h
@@ -8,8 +8,8 @@ struct Image_info {
 	unsigned int ep;
 };
 
-int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch);
-int uImage_probe_kernel(const unsigned char *buf, off_t len, unsigned int arch);
-int uImage_probe_ramdisk(const unsigned char *buf, off_t len, unsigned int arch);
+int uImage_probe(const char *buf, off_t len, unsigned int arch);
+int uImage_probe_kernel(const char *buf, off_t len, unsigned int arch);
+int uImage_probe_ramdisk(const char *buf, off_t len, unsigned int arch);
 int uImage_load(const char *buf, off_t len, struct Image_info *info);
 #endif
diff --git a/kexec/arch/arm/kexec-uImage-arm.c b/kexec/arch/arm/kexec-uImage-arm.c
index 8e0a9ac6d242..03c2f4ddca7b 100644
--- a/kexec/arch/arm/kexec-uImage-arm.c
+++ b/kexec/arch/arm/kexec-uImage-arm.c
@@ -11,8 +11,7 @@
 
 int uImage_arm_probe(const char *buf, off_t len)
 {
-	return uImage_probe_kernel((const unsigned char *)buf, len,
-				   IH_ARCH_ARM);
+	return uImage_probe_kernel(buf, len, IH_ARCH_ARM);
 }
 
 int uImage_arm_load(int argc, char **argv, const char *buf, off_t len,
diff --git a/kexec/kexec-uImage.c b/kexec/kexec-uImage.c
index 2740a26b6d6c..eeee4be10f41 100644
--- a/kexec/kexec-uImage.c
+++ b/kexec/kexec-uImage.c
@@ -24,7 +24,7 @@
  *
  * Returns 0 if this is not a uImage
  */
-int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch)
+int uImage_probe(const char *buf, off_t len, unsigned int arch)
 {
 	struct image_header header;
 #ifdef HAVE_LIBZ
@@ -109,7 +109,7 @@ int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch)
  *  1		- If the image is not a uImage.
  */
 
-int uImage_probe_kernel(const unsigned char *buf, off_t len, unsigned int arch)
+int uImage_probe_kernel(const char *buf, off_t len, unsigned int arch)
 {
 	int type = uImage_probe(buf, len, arch);
 	if (type < 0)
@@ -118,7 +118,7 @@ int uImage_probe_kernel(const unsigned char *buf, off_t len, unsigned int arch)
 	return !(type == IH_TYPE_KERNEL || type == IH_TYPE_KERNEL_NOLOAD);
 }
 
-int uImage_probe_ramdisk(const unsigned char *buf, off_t len, unsigned int arch)
+int uImage_probe_ramdisk(const char *buf, off_t len, unsigned int arch)
 {
 	int type = uImage_probe(buf, len, arch);
 
@@ -220,7 +220,7 @@ static int uImage_gz_load(const char *buf, off_t len,
 	} while (1);
 
 	inflateEnd(&strm);
-	image->buf = uncomp_buf;
+	image->buf = (char *)uncomp_buf;
 	image->len = mem_alloc - strm.avail_out;
 	return 0;
 }
@@ -235,7 +235,7 @@ static int uImage_gz_load(const char *UNUSED(buf), off_t UNUSED(len),
 int uImage_load(const char *buf, off_t len, struct Image_info *image)
 {
 	const struct image_header *header = (const struct image_header *)buf;
-	const unsigned char *img_buf = buf + sizeof(struct image_header);
+	const char *img_buf = buf + sizeof(struct image_header);
 	off_t img_len = be32_to_cpu(header->ih_size);
 
 	/*
-- 
2.13.0

Places

File 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch of Package kexec-tools (Revision 44768d86ade2e2cd60bcd5cc7282b144)

Places