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

util/cbfstool: Fix GCC error due to a shadowed declaration 

There is already a function with the name buffer_size(). Adding a local
variable with the same name will lead to the following error on older
GCC versions (e.g. version 4.4.7):

declaration of 'buffer_size' shadows a global declaration

To fix this rename the local variable to buffer_len.

Change-Id: Ifae3a17152f2f9852d29a4ac038f7e5a75a41614
Signed-off-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-on: https://review.coreboot.org/c/29776
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Joel Kitching <kitching@google.com>
Reviewed-by: Mario Scheithauer <mario.scheithauer@siemens.com>
This commit is contained in:
Werner Zeh 2018-11-21 13:07:50 +01:00
parent deed1e3c63
commit bbf1df76a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/cbfstool/cbfs_image.c
View File

@ -1299,7 +1299,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
unsigned int decompressed_size = 0; unsigned int decompressed_size = 0;
unsigned int compression = cbfs_file_get_compression_info(entry, unsigned int compression = cbfs_file_get_compression_info(entry,
&decompressed_size); &decompressed_size);
unsigned int buffer_size; unsigned int buffer_len;
decomp_func_ptr decompress; decomp_func_ptr decompress;
if (do_processing) { if (do_processing) {
@ -1308,11 +1308,11 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
ERROR("looking up decompression routine failed\n"); ERROR("looking up decompression routine failed\n");
return -1; return -1;
} }
buffer_size = decompressed_size; buffer_len = decompressed_size;
} else { } else {
/* Force nop decompression */ /* Force nop decompression */
decompress = decompression_function(CBFS_COMPRESS_NONE); decompress = decompression_function(CBFS_COMPRESS_NONE);
buffer_size = compressed_size; buffer_len = compressed_size;
} }
LOG("Found file %.30s at 0x%x, type %.12s, compressed %d, size %d\n", LOG("Found file %.30s at 0x%x, type %.12s, compressed %d, size %d\n",
@ -1321,8 +1321,8 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name,
decompressed_size); decompressed_size);
buffer_init(&buffer, strdup("(cbfs_export_entry)"), NULL, 0); buffer_init(&buffer, strdup("(cbfs_export_entry)"), NULL, 0);
buffer.data = malloc(buffer_size); buffer.data = malloc(buffer_len);
buffer.size = buffer_size; buffer.size = buffer_len;
if (decompress(CBFS_SUBHEADER(entry), compressed_size, if (decompress(CBFS_SUBHEADER(entry), compressed_size,
buffer.data, buffer.size, NULL)) { buffer.data, buffer.size, NULL)) {