Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29776
Change subject: util/cbfstool: Fix GCC error due to a shadowed declaration ......................................................................
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 --- M util/cbfstool/cbfs_image.c 1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/29776/1
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 3c5d29c..7d78e39 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1299,7 +1299,7 @@ unsigned int decompressed_size = 0; unsigned int compression = cbfs_file_get_compression_info(entry, &decompressed_size); - unsigned int buffer_size; + unsigned int guffer_len; decomp_func_ptr decompress;
if (do_processing) { @@ -1308,11 +1308,11 @@ ERROR("looking up decompression routine failed\n"); return -1; } - buffer_size = decompressed_size; + guffer_len = decompressed_size; } else { /* Force nop decompression */ decompress = decompression_function(CBFS_COMPRESS_NONE); - buffer_size = compressed_size; + guffer_len = compressed_size; }
LOG("Found file %.30s at 0x%x, type %.12s, compressed %d, size %d\n", @@ -1321,8 +1321,8 @@ decompressed_size);
buffer_init(&buffer, strdup("(cbfs_export_entry)"), NULL, 0); - buffer.data = malloc(buffer_size); - buffer.size = buffer_size; + buffer.data = malloc(guffer_len); + buffer.size = guffer_len;
if (decompress(CBFS_SUBHEADER(entry), compressed_size, buffer.data, buffer.size, NULL)) {