aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2015-05-09 08:06:02 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-05-19 07:17:36 +0200
commitc877149e9d46b0de4bc709faf3cfb4f0a23c9cc5 (patch)
tree02e5fc6fb96d3fce87823a6661e4dffa3c3528fe /util
parentdf699d545f38bc9529401d862f4a9a80228da6b7 (diff)
downloadcoreboot-c877149e9d46b0de4bc709faf3cfb4f0a23c9cc5.tar.gz
coreboot-c877149e9d46b0de4bc709faf3cfb4f0a23c9cc5.tar.xz
coreboot-c877149e9d46b0de4bc709faf3cfb4f0a23c9cc5.zip
cbfstool: Fix fmd_scanner build compatibility
Fixes these errors: error: declaration of ‘input’ shadows a global declaration [-Werror=shadow] error: redundant redeclaration of ‘isatty’ [-Werror=redundant-decls] Change-Id: I4563d36e5389db4fdc5be3ca4e0e88af2642f7f8 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/10162 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Sol Boucher <solb@chromium.org> Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Diffstat (limited to 'util')
-rw-r--r--util/cbfstool/Makefile3
-rw-r--r--util/cbfstool/Makefile.inc4
-rw-r--r--util/cbfstool/fmd_scanner.l12
3 files changed, 11 insertions, 8 deletions
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 4238445aa..6e8235b49 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -93,7 +93,8 @@ $(FMAPTESTS_BINARY): $(FMAPTESTS_COMMON)
# Yacc source is superset of header
$(obj)/fmd_parser.o: CFLAGS += -Wno-redundant-decls
-# Lex generates unneeded functions
+# Lex generates unneeded functions and declarations
+$(obj)/fmd_scanner.o: CFLAGS += -Wno-redundant-decls
$(obj)/fmd_scanner.o: CFLAGS += -Wno-unused-function
# Tolerate lzma sdk warnings
$(obj)/lzma/C/LzmaEnc.o: CFLAGS += -Wno-sign-compare -Wno-cast-qual
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 1aa9d76ae..52c3e42c0 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -82,8 +82,10 @@ $(objutil)/cbfstool/rmodtool: $(addprefix $(objutil)/cbfstool/,$(rmodobj))
$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))
# Yacc source is superset of header
+$(objutil)/cbfstool/fmd.o: TOOLCFLAGS += -Wno-redundant-decls
$(objutil)/cbfstool/fmd_parser.o: TOOLCFLAGS += -Wno-redundant-decls
-# Lex generates unneeded functions
+# Lex generates unneeded functions and declarations
+$(objutil)/cbfstool/fmd_scanner.o: TOOLCFLAGS += -Wno-redundant-decls
$(objutil)/cbfstool/fmd_scanner.o: TOOLCFLAGS += -Wno-unused-function
# Tolerate lzma sdk warnings
$(objutil)/cbfstool/LzmaEnc.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual
diff --git a/util/cbfstool/fmd_scanner.l b/util/cbfstool/fmd_scanner.l
index d2cc43d04..0a582105f 100644
--- a/util/cbfstool/fmd_scanner.l
+++ b/util/cbfstool/fmd_scanner.l
@@ -23,8 +23,8 @@
#include <assert.h>
#include <string.h>
-int parse_integer(char *input, int base);
-int copy_string(const char *input);
+int parse_integer(char *src, int base);
+int copy_string(const char *src);
%}
%option noyywrap
@@ -44,10 +44,10 @@ MULTIPLIER [KMG]
%%
-int parse_integer(char *input, int base)
+int parse_integer(char *src, int base)
{
char *multiplier = NULL;
- unsigned val = strtoul(input, &multiplier, base);
+ unsigned val = strtoul(src, &multiplier, base);
if (*multiplier) {
switch(*multiplier) {
@@ -71,8 +71,8 @@ int parse_integer(char *input, int base)
return INTEGER;
}
-int copy_string(const char *input)
+int copy_string(const char *src)
{
- yylval.strval = strdup(input);
+ yylval.strval = strdup(src);
return STRING;
}