summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2014-10-28 11:32:24 +0100
committerAnatolij Gustschin <agust@denx.de>2014-10-31 00:29:29 +0100
commit934a529f94f653c869e750d8178b7ace62dadaf3 (patch)
tree6de7a00ba133412ca67651eb417e4da1e8770068
parente5f1a586a7767e9fdf6f81bd99a89f277ced4c70 (diff)
downloadu-boot-imx-934a529f94f653c869e750d8178b7ace62dadaf3.zip
u-boot-imx-934a529f94f653c869e750d8178b7ace62dadaf3.tar.gz
u-boot-imx-934a529f94f653c869e750d8178b7ace62dadaf3.tar.bz2
tools/kwbimage: Fix compilation warning
This patch fixes a compilation warning of kwbimage.c: tools/kwbimage.c: In function ‘kwbimage_set_header’: tools/kwbimage.c:784:8: warning: ‘headersz’ may be used uninitialized in this function [-Wmaybe-uninitialized] memcpy(ptr, image, headersz); ^ Instead of using multiple if statements, use a switch statement with a default entry. And return with error if an unsupported version is configured in the cfg file. Signed-off-by: Stefan Roese <sr@denx.de> Acked-By: Wolfgang Denk <wd@denx.de>
-rw-r--r--tools/kwbimage.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index aab7f2d..ec52f9e 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -760,14 +760,25 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,
}
version = image_get_version();
- /* Fallback to version 0 is no version is provided in the cfg file */
- if (version == -1)
- version = 0;
-
- if (version == 0)
+ switch (version) {
+ /*
+ * Fallback to version 0 if no version is provided in the
+ * cfg file
+ */
+ case -1:
+ case 0:
image = image_create_v0(&headersz, params, sbuf->st_size);
- else if (version == 1)
+ break;
+
+ case 1:
image = image_create_v1(&headersz, params, sbuf->st_size);
+ break;
+
+ default:
+ fprintf(stderr, "Unsupported version %d\n", version);
+ free(image_cfg);
+ exit(EXIT_FAILURE);
+ }
if (!image) {
fprintf(stderr, "Could not create image\n");