Skip to contentSkip to conversation

spl: Fix compiling warning on gunzip argument

PATCH Superseded York Sun 2 participants 4 messages Sep 15, 2017 – Sep 22, 2017

lore
Share & tools
lore

York Sun

author
#0 lore raw

PATCH v2 1/1 spl: Fix compiling warning on gunzip argument

common/spl/spl_fit.c:201:12: warning: passing argument 4 of ‘gunzip’ from incompatible pointer type [-Wincompatible-pointer-types]

       src, &length))
Signed-off-by York Sun <[email protected]>
Reported-by Heinrich Schuchardt <[email protected]>
CC Jean-Jacques Hiblot <[email protected]>

---
Change log
v2: Update length after gunzip

 common/spl/spl_fit.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
common/spl/spl_fit.c +4 -1
index 49ccf1c..32d9ee5 100644
@@ -135,6 +135,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
 	int offset;
 	size_t length;
 	int len;
+	ulong size;
 	ulong load_addr, load_ptr;
 	void *src;
 	ulong overhead;

@@ -197,11 +198,13 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
 	    IS_ENABLED(CONFIG_SPL_GZIP)		&&
 	    image_comp == IH_COMP_GZIP		&&
 	    type == IH_TYPE_KERNEL) {
+		size = length;
 		if (gunzip((void *)load_addr, CONFIG_SYS_BOOTM_LEN,
-			   src, &length)) {
+			   src, &size)) {
 			puts("Uncompressing error\n");
 			return -EIO;
 		}
+		length = size;
 	} else {
 		memcpy((void *)load_addr, src, length);
 	}
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 1/1 spl: Fix compiling warning on gunzip argument

Quoted 11 lines · York Sun

common/spl/spl_fit.c:201:12: warning: passing argument 4 of ‘gunzip’ from incompatible pointer type [-Wincompatible-pointer-types]

        src, &length))
Signed-off-by York Sun <[email protected]>
Reported-by Heinrich Schuchardt <[email protected]>
CC Jean-Jacques Hiblot <[email protected]>

---
Change log
v2: Update length after gunzip

Tom,

Will you bring in this patch or you prefer a PR? I am about to send a PR in a day or two (pending travis-ci testing).

York

#2 lore raw

PATCH v2 1/1 spl: Fix compiling warning on gunzip argument

Quoted 13 lines · York Sun
Quoted 11 lines · York Sun

common/spl/spl_fit.c:201:12: warning: passing argument 4 of ‘gunzip’ from incompatible pointer type [-Wincompatible-pointer-types]

        src, &length))
Signed-off-by York Sun <[email protected]>
Reported-by Heinrich Schuchardt <[email protected]>
CC Jean-Jacques Hiblot <[email protected]>

---
Change log
v2: Update length after gunzip

Quoted 4 lines

Tom,

Will you bring in this patch or you prefer a PR? I am about to send a PR in a day or two (pending travis-ci testing).

I'll be picking this up shortly, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170920/1b8f0987/attachment.sig>
#3 lore raw

PATCH v2 1/1 spl: Fix compiling warning on gunzip argument

In reply to York Sun
Quoted 7 lines · York Sun

common/spl/spl_fit.c:201:12: warning: passing argument 4 of ‘gunzip’ from incompatible pointer type [-Wincompatible-pointer-types]

       src, &length))
Signed-off-by York Sun <[email protected]>
Reported-by Heinrich Schuchardt <[email protected]>
CC Jean-Jacques Hiblot <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170922/c9f976a9/attachment.sig>