X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=warning.c;h=05195e6227f04db7efa1d07e54daee80bc1fb057;hb=2151f7ff22ee388e6a57ff024d2558101907e7f7;hp=5cc88afc182cad950f42af4ff400a7859d1e0d4e;hpb=b0aa2b8099bedd208a13e4955ad92764bffdd754;p=cparser

diff --git a/warning.c b/warning.c
index 5cc88af..05195e6 100644
--- a/warning.c
+++ b/warning.c
@@ -1,13 +1,59 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <stdio.h>
 #include <string.h>
 #include "warning.h"
 
+warning_t warning = {
+	.char_subscripts               = true,
+	.check_format                  = true,
+	.empty_statement               = false,
+	.fatal_errors                  = false,
+	.float_equal                   = false,
+	.implicit_function_declaration = true,
+	.implicit_int                  = true,
+	.main                          = true,
+	.missing_declarations          = false,
+	.missing_prototypes            = false,
+	.multichar                     = true,
+	.redundant_decls               = true,
+	.s_are_errors                  = false,
+	.shadow                        = false,
+	.sign_compare                  = false,
+	.strict_prototypes             = true,
+	.switch_default                = false,
+	.unknown_pragmas               = true,
+	.unused_function               = false,
+	.unused_label                  = false,
+	.unused_parameter              = false,
+	.unused_value                  = true,
+	.unused_variable               = false
+};
+
 void set_warning_opt(const char *const opt)
 {
 	const char* s = opt;
 
 	bool state = true;
-	/* no- modifier */
+
+	/* "no-" prefix */
 	if (s[0] == 'n' && s[1] == 'o' && s[2] == '-') {
 		s += 3;
 		state = false;
@@ -17,9 +63,38 @@ void set_warning_opt(const char *const opt)
 #define OPTX(x)   else if (strcmp(s, x) == 0)
 #define SET(y)    warning.y = state;
 #define OPT(x, y) OPTX(x) SET(y)
+	OPTX("all") {
+		/* Note: this switched on a lot of more warnings than gcc's -Wall */
+		SET(char_subscripts)
+		SET(check_format)
+		SET(empty_statement)
+		SET(implicit_function_declaration)
+		SET(implicit_int)
+		SET(main)
+		SET(redundant_decls)
+		SET(shadow)
+		SET(sign_compare)
+		SET(strict_prototypes)
+		SET(unknown_pragmas)
+		SET(unused_function)
+		SET(unused_label)
+		SET(unused_parameter)
+		SET(unused_value)
+		SET(unused_variable)
+	}
 	OPT("char-subscripts",               char_subscripts)
 	OPT("empty-statement",               empty_statement)
 	OPT("error",                         s_are_errors)
+	OPTX("extra") {
+		/* TODO */
+		// TODO SET(function_end_without_return)
+		SET(empty_statement)
+		// TODO SET(incomplete_aggregate_init)
+		// TODO SET(pointless_comparison)
+		// TODO SET(sign_compare)
+		SET(unused_parameter)
+		SET(unused_value)
+	}
 	OPT("fatal-errors",                  fatal_errors)
 	OPT("float-equal",                   float_equal)
 	OPT("format",                        check_format)
@@ -32,23 +107,25 @@ void set_warning_opt(const char *const opt)
 	OPT("main",                          main)
 	OPT("missing-declarations",          missing_declarations)
 	OPT("missing-prototypes",            missing_prototypes)
+	OPT("multichar",                     multichar)
 	OPT("redundant-decls",               redundant_decls)
+	OPT("shadow",                        shadow)
+	OPT("sign-compare",                  sign_compare)
 	OPT("strict-prototypes",             strict_prototypes)
 	OPT("switch-default",                switch_default)
 	OPT("unknown-pragmas",               unknown_pragmas)
-	OPT("unused-label",                  unused_label)
-	OPT("unused-parameter",              unused_parameter)
-	OPT("unused-variable",               unused_variable)
-#if 0
 	OPTX("unused") {
 		SET(unused_function)
 		SET(unused_label)
 		SET(unused_parameter)
-		SET(unused_variable)
 		SET(unused_value)
+		SET(unused_variable)
 	}
-#endif
+	OPT("unused-function",               unused_function)
+	OPT("unused-label",                  unused_label)
+	OPT("unused-parameter",              unused_parameter)
 	OPT("unused-value",                  unused_value)
+	OPT("unused-variable",               unused_variable)
 #undef OPT
 #undef SET
 #undef OPT_X
@@ -56,25 +133,3 @@ void set_warning_opt(const char *const opt)
 		fprintf(stderr, "warning: ignoring unknown option -W%s\n", opt);
 	}
 }
-
-warning_t warning = {
-	.char_subscripts               = true,
-	.check_format                  = true,
-	.empty_statement               = false,
-	.fatal_errors                  = false,
-	.float_equal                   = false,
-	.implicit_function_declaration = true,
-	.implicit_int                  = true,
-	.main                          = true,
-	.missing_declarations          = false,
-	.missing_prototypes            = false,
-	.redundant_decls               = true,
-	.s_are_errors                  = false,
-	.strict_prototypes             = true,
-	.switch_default                = false,
-	.unknown_pragmas               = true,
-	.unused_label                  = false,
-	.unused_parameter              = false,
-	.unused_variable               = false,
-	.unused_value                  = true
-};