From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 25 Jul 2010 19:54:17 +0000 (-0400)
Subject: bootm: fix pointer warning with lzma
X-Git-Tag: v2010.09-rc1~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=78e1e8467795d681b3f5f75140ba175e79954273;p=u-boot

bootm: fix pointer warning with lzma

Avoid warning:
cmd_bootm.c: In function 'bootm_load_os':
cmd_bootm.c:394: warning: passing argument 2 of
	'lzmaBuffToBuffDecompress' from incompatible pointer type

For 32 bit systems, this change shouldn't make a difference to code size
since sizeof(size_t) and sizeof(unsigned int) are equal.  But it does fix
the warning.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index adfa6cd18a..594bccbbe0 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -386,12 +386,14 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		break;
 #endif /* CONFIG_BZIP2 */
 #ifdef CONFIG_LZMA
-	case IH_COMP_LZMA:
+	case IH_COMP_LZMA: {
+		SizeT lzma_len = unc_len;
 		printf ("   Uncompressing %s ... ", type_name);
 
 		int ret = lzmaBuffToBuffDecompress(
-			(unsigned char *)load, &unc_len,
+			(unsigned char *)load, &lzma_len,
 			(unsigned char *)image_start, image_len);
+		unc_len = lzma_len;
 		if (ret != SZ_OK) {
 			printf ("LZMA: uncompress or overwrite error %d "
 				"- must RESET board to recover\n", ret);
@@ -400,6 +402,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		}
 		*load_end = load + unc_len;
 		break;
+	}
 #endif /* CONFIG_LZMA */
 #ifdef CONFIG_LZO
 	case IH_COMP_LZO: