Enable -Werror for romcc

[coreboot.git] / util / options / build_opt_tbl.c

diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c
index 0b25b0c19497f4045ea7dc8a8f8df11503a972a7..b89bb4f1d52be4e834d43c284a2430fe96ade93e 100644 (file)
--- a/util/options/build_opt_tbl.c
+++ b/util/options/build_opt_tbl.c
@@ -276,6 +276,7 @@ int main(int argc, char **argv)
        int enum_length;
        int len;
        char buf[16];
+       char val;
 
         for(i=1;i<argc;i++) {
                 if(argv[i][0]!='-') {
@@ -371,8 +372,9 @@ int main(int argc, char **argv)
                }
 
                /* skip commented and blank lines */
-               if(line[0]=='#') continue;
-               if(line[strspn(line," ")]=='\n') continue;
+               val = line[strspn(line," ")];
+               /* takes care of *nix, Mac and Windows line ending formats */
+               if (val=='#' || val=='\n' || val=='\r') continue;
                /* scan in the input data */
                sscanf(line,"%d %d %c %d %s",
                        &ce->bit,&ce->length,&uc,&ce->config_id,&ce->name[0]);
@@ -541,7 +543,7 @@ int main(int argc, char **argv)
                }
 
                /* write the header */
-               if(!fwrite("unsigned char option_table[] = {",1,32,fp)) {
+               if(fwrite("unsigned char option_table[] = {",1,32,fp) != 32) {
                        perror("Error - Could not write image file");
                        fclose(fp);
                        unlink(tempfilename);
@@ -549,14 +551,14 @@ int main(int argc, char **argv)
                }
                /* write the array values */
                for(i=0; i<(int)(ct->size-1); i++) {
-                       if(!(i%10) && !err) err=!fwrite("\n\t",1,2,fp);
+                       if(!(i%10) && !err) err=(fwrite("\n\t",1,2,fp) != 2);
                        sprintf(buf,"0x%02x,",cmos_table[i]);
-                       if(!err) err=!fwrite(buf,1,5,fp);
+                       if(!err) err=(fwrite(buf,1,5,fp) != 5);
                }
                /* write the end */
                sprintf(buf,"0x%02x\n",cmos_table[i]);
-               if(!err) err=!fwrite(buf,1,4,fp);
-               if(!fwrite("};\n",1,3,fp)) {
+               if(!err) err=(fwrite(buf,1,4,fp) != 4);
+               if(fwrite("};\n",1,3,fp) != 3) {
                        perror("Error - Could not write image file");
                        fclose(fp);
                        unlink(tempfilename);
@@ -590,7 +592,7 @@ int main(int argc, char **argv)
                }
 
                /* write the array values */
-               if(!fwrite(cmos_table, (int)(ct->size-1), 1, fp)) {
+               if(fwrite(cmos_table, (int)(ct->size-1), 1, fp) != 1) {
                        perror("Error - Could not write image file");
                        fclose(fp);
                        unlink(tempfilename);