diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-01 14:22:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 14:22:48 +0000 |
| commit | 109e897798ef4df9b51e756900b4d31d1a5cffe6 (patch) | |
| tree | 7051b393f453edcdc6b7218d51f5b4d382f10554 | |
| parent | 67a24410a76f0b3cd1da0ffa083b5eb174b6efcc (diff) | |
| parent | f9b754f0f8fc11e0ff2f9d81ae4c3ef180b286e6 (diff) | |
| download | genimage-109e897798ef4df9b51e756900b4d31d1a5cffe6.tar.gz genimage-109e897798ef4df9b51e756900b4d31d1a5cffe6.tar.xz | |
Merge pull request #56 from michaelolbrich/lgtm
fix some minor issues found by LGTM
| -rw-r--r-- | config.c | 10 | ||||
| -rw-r--r-- | image-flash.c | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -117,7 +117,7 @@ cfg_opt_t *get_confuse_opts(void) { struct config *c; int num_opts = 0; - cfg_opt_t *opts; + cfg_opt_t *options; int i = 0; cfg_opt_t cfg_end[] = { CFG_END() @@ -128,18 +128,18 @@ cfg_opt_t *get_confuse_opts(void) num_opts++; } - opts = xzalloc(sizeof(cfg_opt_t) * (num_opts + 1)); + options = xzalloc(sizeof(cfg_opt_t) * (num_opts + 1)); list_for_each_entry(c, &optlist, list) { if (c->opt.name) { - memcpy(&opts[i], &c->opt, sizeof(cfg_opt_t)); + memcpy(&options[i], &c->opt, sizeof(cfg_opt_t)); i++; } } - memcpy(&opts[i], cfg_end, sizeof(cfg_opt_t)); + memcpy(&options[i], cfg_end, sizeof(cfg_opt_t)); - return opts; + return options; } /* diff --git a/image-flash.c b/image-flash.c index 79b8e31..33380b7 100644 --- a/image-flash.c +++ b/image-flash.c @@ -86,7 +86,7 @@ static int flash_setup(struct image *image, cfg_t *cfg) return -EINVAL; } - flashsize = image->flash_type->pebsize * image->flash_type->numpebs; + flashsize = (unsigned long long)image->flash_type->pebsize * image->flash_type->numpebs; list_for_each_entry(part, &image->partitions, list) { if (last) { |