brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-05 02:36:39 +09:00
Code Issues Projects Releases Wiki Activity

bootm: fix pointer warning with lzma

Browse Source 
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>
This commit is contained in:
Mike Frysinger 2010-07-25 15:54:17 -04:00 committed by Wolfgang Denk
parent 36448c6038
commit 78e1e84677
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/cmd_bootm.c
View File

@ -386,12 +386,14 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
break; break;
#endif /* CONFIG_BZIP2 */ #endif /* CONFIG_BZIP2 */
#ifdef CONFIG_LZMA #ifdef CONFIG_LZMA
case IH_COMP_LZMA: case IH_COMP_LZMA: {
SizeT lzma_len = unc_len;
printf (" Uncompressing %s ... ", type_name); printf (" Uncompressing %s ... ", type_name);
int ret = lzmaBuffToBuffDecompress( int ret = lzmaBuffToBuffDecompress(
(unsigned char *)load, &unc_len, (unsigned char *)load, &lzma_len,
(unsigned char *)image_start, image_len); (unsigned char *)image_start, image_len);
unc_len = lzma_len;
if (ret != SZ_OK) { if (ret != SZ_OK) {
printf ("LZMA: uncompress or overwrite error %d " printf ("LZMA: uncompress or overwrite error %d "
"- must RESET board to recover\n", ret); "- 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; *load_end = load + unc_len;
break; break;
}
#endif /* CONFIG_LZMA */ #endif /* CONFIG_LZMA */
#ifdef CONFIG_LZO #ifdef CONFIG_LZO
case IH_COMP_LZO: case IH_COMP_LZO: