diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
| commit | fa12b67771f73f0e7acf2308a13cf33b8c619884 (patch) | |
| tree | 853c5b64915c1b13749561d30bbd34c8d46f1bc4 /util/options | |
| parent | d233f363c129dae2ba5fd7ac536cf92fb4c2dd6e (diff) | |
Remove warnings from compilation of the s2892 with and without CBFS.
I didn't try to remove "defined but not used" warnings because there are too
many ifdefs to be sure I wouldn't break something.
For shadowed variable declarations I renamed the inner-most variable.
The one in src/pc80/keyboard.c might need help. I didn't change the
functionality but it looks like a bug.
I boot tested it on s2892 and abuild tested it.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/options')
| -rw-r--r-- | util/options/build_opt_tbl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c index cca1b7c464..f86090aeb4 100644 --- a/util/options/build_opt_tbl.c +++ b/util/options/build_opt_tbl.c @@ -487,6 +487,7 @@ int main(int argc, char **argv) /* See if we want to output a C source file */ if(option) { + int err=0; strncpy(tmpfilename, dirname(option), TMPFILE_LEN); strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN); tmpfile = mkstemp(tmpfilename); @@ -510,13 +511,13 @@ int main(int argc, char **argv) } /* write the array values */ for(i=0;i<(ct->size-1);i++) { - if(!(i%10)) fwrite("\n\t",1,2,fp); + if(!(i%10) && !err) err=fwrite("\n\t",1,2,fp); sprintf(buf,"0x%02x,",cmos_table[i]); - fwrite(buf,1,5,fp); + if(!err) err=fwrite(buf,1,5,fp); } /* write the end */ sprintf(buf,"0x%02x\n",cmos_table[i]); - fwrite(buf,1,4,fp); + if(!err) err=fwrite(buf,1,4,fp); if(!fwrite("};\n",1,3,fp)) { perror("Error - Could not write image file"); fclose(fp); |