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

util/bincfg: Fix all issues 

This fixes the following issues:

bincfg.l: In function ‘parsehex’:
error: declaration of ‘val’ shadows a global declaration

bincfg.y: In function ‘generate_binary_with_gbe_checksum’:
error: comparison of integer expressions of different signedness

bincfg.y: In function ‘yyerror’:
bincfg.y:408:28: error: unused parameter ‘fp’

bincfg.y: In function ‘main’:
bincfg.y:452:15: error: unused variable ‘pos’
bincfg.y:451:16: error: unused variable ‘c’

BUG=None
TEST=Build outputs and make sure they're identical.

Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I60039b741c226a6b6ba53306f6fa293da89e5355
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50653
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Martin Roth 2021-02-13 23:19:51 -07:00 committed by Patrick Georgi
parent 264e14b143
commit db4719f039
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/bincfg/bincfg.l
View File

@ -11,7 +11,7 @@ extern struct blob binary;
unsigned int parsehex (char *s) unsigned int parsehex (char *s)
{ {
unsigned int i, nib, val = 0; unsigned int i, nib, retval = 0;
unsigned int nibs = strlen(s) - 2; unsigned int nibs = strlen(s) - 2;
for (i = 2; i < nibs + 2; i++) { for (i = 2; i < nibs + 2; i++) {
@ -24,9 +24,9 @@ unsigned int parsehex (char *s)
} else { } else {
return 0; return 0;
} }
val |= nib << (((nibs - 1) - (i - 2)) * 4); retval |= nib << (((nibs - 1) - (i - 2)) * 4);
} }
return val; return retval;
} }
char* stripquotes (char *string) char* stripquotes (char *string)

5
util/bincfg/bincfg.y
View File

@ -223,7 +223,7 @@ static void generate_setter_bitfields(FILE* fp, unsigned char *bin)
static void generate_binary_with_gbe_checksum(FILE* fp) static void generate_binary_with_gbe_checksum(FILE* fp)
{ {
int i; unsigned int i;
unsigned short checksum; unsigned short checksum;
/* traverse spec, push to blob and add up for checksum */ /* traverse spec, push to blob and add up for checksum */
@ -407,6 +407,7 @@ setpair:
/* Called by yyparse on error. */ /* Called by yyparse on error. */
static void yyerror (FILE* fp, char const *s) static void yyerror (FILE* fp, char const *s)
{ {
(void)fp;
fprintf (stderr, "yyerror: %s\n", s); fprintf (stderr, "yyerror: %s\n", s);
} }
@ -448,8 +449,6 @@ int main (int argc, char *argv[])
{ {
unsigned int lenspec; unsigned int lenspec;
unsigned char *parsestring; unsigned char *parsestring;
unsigned char c;
unsigned int pos = 0;
int ret = 0; int ret = 0;
FILE* fp; FILE* fp;