Wrapper around FILE to take advantage of MSVC "secure" CRT. We don't actually defend...

[xonotic/gmqcc.git] / opts.c

diff --git a/opts.c b/opts.c
index 2a7dc8d3dde16507aa9b1948d28dddc6489732e6..69e93b428fdcdb84689a3c3ddb3a817c2589b75c 100644 (file)
--- a/opts.c
+++ b/opts.c
@@ -52,6 +52,7 @@ static void opts_setdefault() {
     opts_set(opts.warn,  WARN_MULTIBYTE_CHARACTER,       true);
     opts_set(opts.warn,  WARN_UNKNOWN_PRAGMAS,           true);
     opts_set(opts.warn,  WARN_UNREACHABLE_CODE,          true);
+    opts_set(opts.warn,  WARN_CPP,                       true);
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);
     opts_set(opts.flags, FTEPP,                          false);
@@ -88,13 +89,16 @@ static bool opts_setflag_all(const char *name, bool on, uint32_t *flags, const o
     }
     return false;
 }
-bool opts_setflag (const char *name, bool on) {
+bool opts_setflag  (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.flags,        opts_flag_list, COUNT_FLAGS);
 }
-bool opts_setwarn (const char *name, bool on) {
+bool opts_setwarn  (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.warn,         opts_warn_list, COUNT_WARNINGS);
 }
-bool opts_setoptim(const char *name, bool on) {
+bool opts_setwerror(const char *name, bool on) {
+    return opts_setflag_all(name, on, opts.werror,       opts_warn_list, COUNT_WARNINGS);
+}
+bool opts_setoptim (const char *name, bool on) {
     return opts_setflag_all(name, on, opts.optimization, opts_opt_list,  COUNT_OPTIMIZATIONS);
 }
 
@@ -165,7 +169,7 @@ static size_t opts_ini_parse (
     char *read_name;
     char *read_value;
 
-    while (util_getline(&line, &linesize, filehandle) != EOF) {
+    while (file_getline(&line, &linesize, filehandle) != EOF) {
         parse_beg = line;
 
         /* handle BOM */
@@ -311,11 +315,11 @@ void opts_ini_init(const char *file) {
     
     if (!file) {
         /* try ini */
-        if (!(ini = fopen((file = "gmqcc.ini"), "r")))
+        if (!(ini = file_open((file = "gmqcc.ini"), "r")))
             /* try cfg */
-            if (!(ini = fopen((file = "gmqcc.cfg"), "r")))
+            if (!(ini = file_open((file = "gmqcc.cfg"), "r")))
                 return;
-    } else if (!(ini = fopen(file, "r")))
+    } else if (!(ini = file_open(file, "r")))
         return;
 
     con_out("found ini file `%s`\n", file);
@@ -326,5 +330,5 @@ void opts_ini_init(const char *file) {
         vec_free(error);
     }
 
-    fclose(ini);
+    file_close(ini);
 }