adapt to latest libfirm

[cparser] / warning.c

diff --git a/warning.c b/warning.c
index 5713d8c..975f2d0 100644 (file)
--- a/warning.c
+++ b/warning.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "adt/strutil.h"
 #include "adt/util.h"
 #include "warning.h"
 #include "help.h"
@@ -64,6 +65,7 @@ static warning_switch_t warning[] = {
        [WARN_SHADOW]                        = { WARN_STATE_NONE, "shadow",                       },
        [WARN_SHADOW_LOCAL]                  = { WARN_STATE_NONE, "shadow-local",                 },
        [WARN_SIGN_COMPARE]                  = { WARN_STATE_NONE, "sign-compare",                 },
+       [WARN_STRAY_SEMICOLON]               = { WARN_STATE_ON,   "stray-semicolon",              },
        [WARN_STRICT_PROTOTYPES]             = { WARN_STATE_ON,   "strict-prototypes"             },
        [WARN_SWITCH_DEFAULT]                = { WARN_STATE_NONE, "switch-default",               },
        [WARN_SWITCH_ENUM]                   = { WARN_STATE_NONE, "switch-enum",                  },
@@ -90,7 +92,9 @@ void print_warning_opt_help(void)
 {
        /* 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, "");
        }
 }
 
@@ -98,8 +102,9 @@ void set_warning_opt(const char *const opt)
 {
        /* 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;
@@ -116,7 +121,7 @@ void set_warning_opt(const char *const opt)
        }
 
        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;
                }
@@ -125,7 +130,7 @@ void set_warning_opt(const char *const opt)
        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 */
@@ -183,7 +188,7 @@ extra:
        }
 #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;