-Werror-<warning> should actually use opts_setwerror

This commit is contained in:
Wolfgang Bumiller 2012-12-20 16:53:09 +01:00
parent b360245b45
commit 6cd821d459
3 changed files with 9 additions and 8 deletions

View file

@ -826,9 +826,10 @@ typedef struct {
longbit bit;
} opts_flag_def;
bool opts_setflag (const char *, bool);
bool opts_setwarn (const char *, bool);
bool opts_setoptim(const char *, bool);
bool opts_setflag (const char *, bool);
bool opts_setwarn (const char *, bool);
bool opts_setwerror(const char *, bool);
bool opts_setoptim (const char *, bool);
void opts_init (const char *, int, size_t);
void opts_set (uint32_t *, size_t, bool);

4
main.c
View file

@ -345,13 +345,13 @@ static bool options_parse(int argc, char **argv) {
break;
}
else if (!strncmp(argv[0]+2, "ERROR_", 6)) {
if (!opts_setwarn(argv[0]+8, true)) {
if (!opts_setwerror(argv[0]+8, true)) {
con_out("unknown warning: %s\n", argv[0]+2);
return false;
}
}
else if (!strncmp(argv[0]+2, "NO_ERROR_", 9)) {
if (!opts_setwarn(argv[0]+11, false)) {
if (!opts_setwerror(argv[0]+11, false)) {
con_out("unknown warning: %s\n", argv[0]+2);
return false;
}

6
opts.c
View file

@ -88,16 +88,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_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) {
bool opts_setoptim (const char *name, bool on) {
return opts_setflag_all(name, on, opts.optimization, opts_opt_list, COUNT_OPTIMIZATIONS);
}