Re: [U-Boot] [PATCH v2 12/18] tools: kwbimage: Reduce scope of variables

[Stefan Roese]

On 11.01.2017 16:00, Mario Six wrote:

This patch reduces the scope of some variables.

Signed-off-by: Mario Six 
---
Changes in v2:

None


Applied to u-boot-marvell/master

Thanks,
Stefan
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 12/18] tools: kwbimage: Reduce scope of variables

[Stefan Roese]

On 11.01.2017 16:00, Mario Six wrote:

This patch reduces the scope of some variables.

Signed-off-by: Mario Six 
---
Changes in v2:

None


Reviewed-by: Stefan Roese 

Thanks,
Stefan
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 12/18] tools: kwbimage: Reduce scope of variables

[Mario Six]

This patch reduces the scope of some variables.

Signed-off-by: Mario Six 
---
Changes in v2:

None
---
 tools/kwbimage.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index edc5d34..4fd9389 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -230,7 +230,6 @@ static void *image_create_v0(size_t *imagesz, struct 
image_tool_params *params,
struct image_cfg_element *e;
size_t headersz;
struct main_hdr_v0 *main_hdr;
-   struct ext_hdr_v0 *ext_hdr;
uint8_t *image;
int has_ext = 0;

@@ -282,6 +281,7 @@ static void *image_create_v0(size_t *imagesz, struct 
image_tool_params *params,

/* Generate the ext header */
if (has_ext) {
+   struct ext_hdr_v0 *ext_hdr;
int cfgi, datai;

ext_hdr = (struct ext_hdr_v0 *)
@@ -313,7 +313,6 @@ static size_t image_headersz_v1(struct image_tool_params 
*params,
 {
struct image_cfg_element *binarye;
size_t headersz;
-   int ret;

/*
 * Calculate the size of the header and the size of the
@@ -333,6 +332,7 @@ static size_t image_headersz_v1(struct image_tool_params 
*params,

binarye = image_find_option(IMAGE_CFG_BINARY);
if (binarye) {
+   int ret;
struct stat s;

ret = stat(binarye->binary.file, );
@@ -388,7 +388,6 @@ static void *image_create_v1(size_t *imagesz, struct 
image_tool_params *params,
size_t headersz;
uint8_t *image, *cur;
int hasext = 0;
-   int ret;

/*
 * Calculate the size of the header and the size of the
@@ -444,6 +443,7 @@ static void *image_create_v1(size_t *imagesz, struct 
image_tool_params *params,
struct stat s;
int argi;
FILE *bin;
+   int ret;

hdr->headertype = OPT_HDR_V1_BINARY_TYPE;

@@ -818,7 +818,6 @@ static int kwbimage_verify_header(unsigned char *ptr, int 
image_size,
  struct image_tool_params *params)
 {
struct main_hdr_v0 *main_hdr;
-   struct ext_hdr_v0 *ext_hdr;
uint8_t checksum;

main_hdr = (struct main_hdr_v0 *)ptr;
@@ -830,6 +829,8 @@ static int kwbimage_verify_header(unsigned char *ptr, int 
image_size,

/* Only version 0 extended header has checksum */
if (image_version((void *)ptr) == 0) {
+   struct ext_hdr_v0 *ext_hdr;
+
ext_hdr = (struct ext_hdr_v0 *)
(ptr + sizeof(struct main_hdr_v0));
checksum = image_checksum8(ext_hdr,
--
2.9.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot