diff options
author | Stefan Roese <sr@denx.de> | 2014-10-28 13:32:24 +0300 |
---|---|---|
committer | Anatolij Gustschin <agust@denx.de> | 2014-10-31 02:29:29 +0300 |
commit | 934a529f94f653c869e750d8178b7ace62dadaf3 (patch) | |
tree | 6de7a00ba133412ca67651eb417e4da1e8770068 /tools/kwbimage.c | |
parent | e5f1a586a7767e9fdf6f81bd99a89f277ced4c70 (diff) | |
download | u-boot-934a529f94f653c869e750d8178b7ace62dadaf3.tar.xz |
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>
Diffstat (limited to 'tools/kwbimage.c')
-rw-r--r-- | tools/kwbimage.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index aab7f2da4a..ec52f9ee43 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"); |