From a9e5821fdd289bbfc13733011948c2d5f83faa59 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 24 Oct 2007 11:12:15 +0000 Subject: [PATCH] smaller changes to silence build warnings. (trivial) Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2893 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/console/vtxprintf.c | 7 ++++++- src/southbridge/intel/i82801xx/i82801xx_pci.c | 1 - util/options/build_opt_tbl.c | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c index 26a5d24351..72bbac5fb0 100644 --- a/src/console/vtxprintf.c +++ b/src/console/vtxprintf.c @@ -13,6 +13,11 @@ #define is_digit isdigit #define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) +#if 0 +/* We are using number() instead. So this code is obsoleted and should + * probably go away. + */ + static unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) { unsigned long result = 0,value; @@ -44,7 +49,7 @@ static long simple_strtol(const char *cp,char **endp,unsigned int base) return -simple_strtoul(cp+1,endp,base); return simple_strtoul(cp,endp,base); } - +#endif static int skip_atoi(const char **s) { diff --git a/src/southbridge/intel/i82801xx/i82801xx_pci.c b/src/southbridge/intel/i82801xx/i82801xx_pci.c index 58fa2fd939..2c284c08f0 100644 --- a/src/southbridge/intel/i82801xx/i82801xx_pci.c +++ b/src/southbridge/intel/i82801xx/i82801xx_pci.c @@ -26,7 +26,6 @@ static void pci_init(struct device *dev) { - uint32_t reg32; uint16_t reg16; /* Clear system errors */ diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c index 91906a967c..0a27c39e1d 100644 --- a/util/options/build_opt_tbl.c +++ b/util/options/build_opt_tbl.c @@ -217,7 +217,7 @@ int main(int argc, char **argv) struct cmos_entries *ce; struct cmos_enums *c_enums, *c_enums_start; struct cmos_checksum *cs; - unsigned char line[INPUT_LINE_MAX]; + char line[INPUT_LINE_MAX]; unsigned char uc; int entry_mode=0; int enum_mode=0; @@ -229,7 +229,7 @@ int main(int argc, char **argv) int entries_length; int enum_length; int len; - unsigned char buf[16]; + char buf[16]; for(i=1;iname)) { + if (!is_ident((char *)ce->name)) { fprintf(stderr, "Error - Name %s is an invalid identifier in line\n %s\n", ce->name, line); @@ -341,7 +341,7 @@ int main(int argc, char **argv) /* put in the record type */ ce->tag=LB_TAG_OPTION; /* calculate and save the record length */ - len=strlen(ce->name)+1; + len=strlen((char *)ce->name)+1; /* make the record int aligned */ if(len%4) len+=(4-(len%4)); @@ -541,7 +541,7 @@ int main(int argc, char **argv) if (ce->config == 'r') { continue; } - if (!is_ident(ce->name)) { + if (!is_ident((char *)ce->name)) { fprintf(stderr, "Invalid identifier: %s\n", ce->name); exit(1);