GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifwitool: Fix gcc error due to shadowed global declaration 

The name 'bpdt_size' is used for a function as well as ia local variable.
As ifwitool is compiled using HOSTCC, there can be an older gcc version
used for the compilation. With gcc version 4.4.7 I get the following
error: declaration of 'bpdt_size' shadows a global declaration
To fix it, rename the function to get_bpdt_size so that names are
unique now.

Change-Id: I47791c705ac4ab28307c52b86940a7a14a5cfef8
Signed-off-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-on: https://review.coreboot.org/15343
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Werner Zeh 2016-06-24 13:03:38 +02:00
parent 627c27bb92
commit 310580ea13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/cbfstool/ifwitool.c
View File

@ -80,7 +80,7 @@ struct bpdt {
struct bpdt_entry e[0]; struct bpdt_entry e[0];
} __attribute__((packed)); } __attribute__((packed));
static inline size_t bpdt_size(struct bpdt_header *h) static inline size_t get_bpdt_size(struct bpdt_header *h)
{ {
return (sizeof(*h) + BPDT_ENTRY_SIZE * h->descriptor_count); return (sizeof(*h) + BPDT_ENTRY_SIZE * h->descriptor_count);
} }
@ -714,7 +714,7 @@ static size_t alloc_bpdt_buffer(void *data, size_t size, size_t offset,
bpdt_read_header((uint8_t *)data + offset, &bpdt_header, name); bpdt_read_header((uint8_t *)data + offset, &bpdt_header, name);
/* Buffer to read BPDT header and entries. */ /* Buffer to read BPDT header and entries. */
alloc_buffer(b, bpdt_size(&bpdt_header), name); alloc_buffer(b, get_bpdt_size(&bpdt_header), name);
struct bpdt *bpdt = buffer_get(b); struct bpdt *bpdt = buffer_get(b);
memcpy(&bpdt->h, &bpdt_header, BPDT_HEADER_SIZE); memcpy(&bpdt->h, &bpdt_header, BPDT_HEADER_SIZE);
@ -727,7 +727,7 @@ static size_t alloc_bpdt_buffer(void *data, size_t size, size_t offset,
return (offset + BPDT_HEADER_SIZE); return (offset + BPDT_HEADER_SIZE);
/* Read all entries. */ /* Read all entries. */
assert((offset + bpdt_size(&bpdt->h)) < size); assert((offset + get_bpdt_size(&bpdt->h)) < size);
bpdt_read_entries((uint8_t *)data + offset + BPDT_HEADER_SIZE, bpdt, bpdt_read_entries((uint8_t *)data + offset + BPDT_HEADER_SIZE, bpdt,
name); name);