X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=opts.c;h=0c8d3f4c2de1bc7b561777e12fa35484b00441a6;hb=1d05cd28ee07c9b7b71fe3399fd8acf1977eb506;hp=35f71146629900d249fe4fb4488ee53665ddcc16;hpb=921877e8a4d7b5221762490d3f6e3b3666e4381b;p=xonotic%2Fgmqcc.git

diff --git a/opts.c b/opts.c
index 35f7114..0c8d3f4 100644
--- a/opts.c
+++ b/opts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
  *     Wolfgang Bumiller
  *     Dale Weiler 
  *
@@ -27,7 +27,8 @@ opts_cmd_t   opts; /* command lien options */
 
 static void opts_setdefault() {
     memset(&opts, 0, sizeof(opts_cmd_t));
-    
+    opts.correction = true;
+
     /* warnings */
     opts_set(opts.warn,  WARN_UNUSED_VARIABLE,           true);
     opts_set(opts.warn,  WARN_USED_UNINITIALIZED,        true);
@@ -35,7 +36,7 @@ static void opts_setdefault() {
     opts_set(opts.warn,  WARN_EXTENSIONS,                true);
     opts_set(opts.warn,  WARN_FIELD_REDECLARED,          true);
     opts_set(opts.warn,  WARN_MISSING_RETURN_VALUES,     true);
-    opts_set(opts.warn,  WARN_TOO_FEW_PARAMETERS,        true);
+    opts_set(opts.warn,  WARN_INVALID_PARAMETER_COUNT,   true);
     opts_set(opts.warn,  WARN_LOCAL_SHADOWS,             false);
     opts_set(opts.warn,  WARN_LOCAL_CONSTANTS,           true);
     opts_set(opts.warn,  WARN_VOID_VARIABLES,            true);
@@ -58,6 +59,7 @@ static void opts_setdefault() {
     opts_set(opts.warn,  WARN_UNINITIALIZED_CONSTANT,    true);
     opts_set(opts.warn,  WARN_UNINITIALIZED_GLOBAL,      false);
     opts_set(opts.warn,  WARN_DEPRECATED,                true);
+    opts_set(opts.warn,  WARN_PARENTHESIS,               true);
     /* flags */
     opts_set(opts.flags, ADJUST_VECTOR_FIELDS,           true);
     opts_set(opts.flags, FTEPP,                          false);
@@ -66,9 +68,33 @@ static void opts_setdefault() {
     opts_set(opts.flags, BAIL_ON_WERROR,                 true);
 }
 
+void opts_backup_non_Wall() {
+    size_t i;
+    for (i = 0; i <= WARN_DEBUG; ++i)
+        opts_set(opts.warn_backup, i, OPTS_WARN(i));
+}
+
+void opts_restore_non_Wall() {
+    size_t i;
+    for (i = 0; i <= WARN_DEBUG; ++i)
+        opts_set(opts.warn, i, OPTS_GENERIC(opts.warn_backup, i));
+}
+
+void opts_backup_non_Werror_all() {
+    size_t i;
+    for (i = 0; i <= WARN_DEBUG; ++i)
+        opts_set(opts.werror_backup, i, OPTS_WERROR(i));
+}
+
+void opts_restore_non_Werror_all() {
+    size_t i;
+    for (i = 0; i <= WARN_DEBUG; ++i)
+        opts_set(opts.werror, i, OPTS_GENERIC(opts.werror_backup, i));
+}
+
 void opts_init(const char *output, int standard, size_t arraysize) {
     opts_setdefault();
-    
+
     opts.output         = output;
     opts.standard       = (opts_std_t)standard; /* C++ ... y u no like me? */
     opts.max_array_size = arraysize;
@@ -274,6 +300,15 @@ static char *opts_ini_load(const char *section, const char *name, const char *va
     }
     #include "opts.def"
 
+    /* Werror-individuals */
+    #define GMQCC_TYPE_WARNS
+    #define GMQCC_DEFINE_FLAG(X)                                       \
+    if (!strcmp(section, "errors") && !strcmp(name, #X)) {             \
+        opts_set(opts.werror, WARN_##X, opts_ini_bool(value));         \
+        found = true;                                                  \
+    }
+    #include "opts.def"
+
     /* optimizations */
     #define GMQCC_TYPE_OPTIMIZATIONS
     #define GMQCC_DEFINE_FLAG(X,Y)                                     \