]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
bootm: fix pointer warning with lzma
authorMike Frysinger <vapier@gentoo.org>
Sun, 25 Jul 2010 19:54:17 +0000 (15:54 -0400)
committerWolfgang Denk <wd@denx.de>
Tue, 3 Aug 2010 22:43:53 +0000 (00:43 +0200)
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>
common/cmd_bootm.c

index adfa6cd18aea82bca910165c79295d73f6a3d0d8..594bccbbe085fa1f6fd175a4e380c625bff9ab0b 100644 (file)
@@ -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: