<p>Werner Zeh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29776">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool: Fix GCC error due to a shadowed declaration<br><br>There is already a function with the name buffer_size(). Adding a local<br>variable with the same name will lead to the following error on older<br>GCC versions (e.g. version 4.4.7):<br><br>declaration of 'buffer_size' shadows a global declaration<br><br>To fix this rename the local variable to buffer_len.<br><br>Change-Id: Ifae3a17152f2f9852d29a4ac038f7e5a75a41614<br>Signed-off-by: Werner Zeh <werner.zeh@siemens.com><br>---<br>M util/cbfstool/cbfs_image.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/29776/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c</span><br><span>index 3c5d29c..7d78e39 100644</span><br><span>--- a/util/cbfstool/cbfs_image.c</span><br><span>+++ b/util/cbfstool/cbfs_image.c</span><br><span>@@ -1299,7 +1299,7 @@</span><br><span>     unsigned int decompressed_size = 0;</span><br><span>  unsigned int compression = cbfs_file_get_compression_info(entry,</span><br><span>             &decompressed_size);</span><br><span style="color: hsl(0, 100%, 40%);">-        unsigned int buffer_size;</span><br><span style="color: hsl(120, 100%, 40%);">+     unsigned int guffer_len;</span><br><span>     decomp_func_ptr decompress;</span><br><span> </span><br><span>      if (do_processing) {</span><br><span>@@ -1308,11 +1308,11 @@</span><br><span>                       ERROR("looking up decompression routine failed\n");</span><br><span>                        return -1;</span><br><span>           }</span><br><span style="color: hsl(0, 100%, 40%);">-               buffer_size = decompressed_size;</span><br><span style="color: hsl(120, 100%, 40%);">+              guffer_len = decompressed_size;</span><br><span>      } else {</span><br><span>             /* Force nop decompression */</span><br><span>                decompress = decompression_function(CBFS_COMPRESS_NONE);</span><br><span style="color: hsl(0, 100%, 40%);">-                buffer_size = compressed_size;</span><br><span style="color: hsl(120, 100%, 40%);">+                guffer_len = compressed_size;</span><br><span>        }</span><br><span> </span><br><span>        LOG("Found file %.30s at 0x%x, type %.12s, compressed %d, size %d\n",</span><br><span>@@ -1321,8 +1321,8 @@</span><br><span>          decompressed_size);</span><br><span> </span><br><span>  buffer_init(&buffer, strdup("(cbfs_export_entry)"), NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-     buffer.data = malloc(buffer_size);</span><br><span style="color: hsl(0, 100%, 40%);">-      buffer.size = buffer_size;</span><br><span style="color: hsl(120, 100%, 40%);">+    buffer.data = malloc(guffer_len);</span><br><span style="color: hsl(120, 100%, 40%);">+     buffer.size = guffer_len;</span><br><span> </span><br><span>        if (decompress(CBFS_SUBHEADER(entry), compressed_size,</span><br><span>                      buffer.data, buffer.size, NULL)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29776">change 29776</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/c/coreboot/+/29776"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifae3a17152f2f9852d29a4ac038f7e5a75a41614 </div>
<div style="display:none"> Gerrit-Change-Number: 29776 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Werner Zeh <werner.zeh@siemens.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>