Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

image: Avoid switch default in image_decomp()

Browse source 
At present this function is full of preprocessor macros. Adjust it to
check for an unsupported algorithm after the switch(). This will allow
us to drop the macros.

Fix up the return-value path and an extra blank line while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-09-25 07:03:11 -06:00 committed by Tom Rini
parent 918adf8e07
commit b876eb87e9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/image.c
View file

@ -446,7 +446,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
void *load_buf, void *image_buf, ulong image_len,
uint unc_len, ulong *load_end)
{
int ret = 0;
int ret = -ENOSYS;
*load_end = load;
print_decomp_msg(comp, type, load == image_start);
@ -458,6 +458,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
*/
switch (comp) {
case IH_COMP_NONE:
ret = 0;
if (load == image_start)
break;
if (image_len <= unc_len)
@ -539,22 +540,23 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
}
image_len = ret;
break;
}
#endif /* CONFIG_ZSTD */
#endif
default:
printf("Unimplemented compression type %d\n", comp);
return -ENOSYS;
}
if (ret == -ENOSYS) {
printf("Unimplemented compression type %d\n", comp);
return ret;
}
if (ret)
return ret;
*load_end = load + image_len;
return ret;
return 0;
}
#ifndef USE_HOSTCC
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
/**