/*
* This file is part of cparser.
- * Copyright (C) 2007-2009 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.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
*/
#include <assert.h>
#include <stdio.h>
#include <string.h>
+#include "adt/strutil.h"
#include "adt/util.h"
#include "warning.h"
#include "help.h"
[WARN_STRICT_PROTOTYPES] = { WARN_STATE_ON, "strict-prototypes" },
[WARN_SWITCH_DEFAULT] = { WARN_STATE_NONE, "switch-default", },
[WARN_SWITCH_ENUM] = { WARN_STATE_NONE, "switch-enum", },
+ [WARN_SYSTEM] = { WARN_STATE_NONE, "system", },
[WARN_TRADITIONAL] = { WARN_STATE_NONE, "traditional" },
[WARN_UNINITIALIZED] = { WARN_STATE_ON, "uninitialized", },
[WARN_UNKNOWN_PRAGMAS] = { WARN_STATE_ON, "unknown-pragmas", },
{
/* TODO: write explanations */
for (warning_switch_t* i = warning; i != endof(warning); ++i) {
- put_help(i->name, "");
+ char buf[256];
+ snprintf(buf, sizeof(buf), "-W%s", i->name);
+ put_help(buf, "");
}
}
{
/* Process prefixes: -W[no-][error=] */
char const *s = opt;
- bool const no = strncmp(s, "no-", 3) == 0 ? s += 3, true : false;
- bool const error = strncmp(s, "error=", 6) == 0 ? s += 6, true : false;
+ char const *rest;
+ bool const no = (rest = strstart(s, "no-")) ? s = rest, true : false;
+ bool const error = (rest = strstart(s, "error=")) ? s = rest, true : false;
warn_state_t on = WARN_STATE_NONE;
warn_state_t off = WARN_STATE_NONE;
}
for (warning_switch_t* i = warning; i != endof(warning); ++i) {
- if (strcmp(i->name, s) == 0) {
+ if (streq(i->name, s)) {
i->state = (i->state & ~off) | on;
return;
}
if (s[0] == '\0') { // -W is an alias for -Wextra
goto extra;
}
-#define OPTX(x) else if (strcmp(s, x) == 0)
+#define OPTX(x) else if (streq(s, x))
#define SET(y) (void)(warning[y].state = (warning[y].state & ~off) | on)
OPTX("all") {
/* Note: this switched on a lot more warnings than gcc's -Wall */
}
#undef SET
#undef OPT_X
- else if (strcmp(opt /* sic */, "error-implicit-function-declaration") == 0) {
+ else if (streq(opt /* sic */, "error-implicit-function-declaration")) {
/* GCC legacy: This way it only can be activated. */
warning[WARN_IMPLICIT_FUNCTION_DECLARATION].state = WARN_STATE_ON | WARN_STATE_ERROR;
return;