Merge branch 'master' into blub/bc3

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 7edb2b5d641ef5152352bb581995e09ab3bc4c42..bef80723632b9176167b9cf3d4ee939aecca124e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -202,7 +202,7 @@ static bool options_parse(int argc, char **argv) {
                         }
                         exit(0);
                     }
-                    else if (!strncmp(argv[0]+2, "NO-", 3)) {
+                    else if (!strncmp(argv[0]+2, "NO_", 3)) {
                         if (!options_setflag(argv[0]+5, false)) {
                             printf("unknown flag: %s\n", argv[0]+2);
                             return false;
@@ -223,12 +223,12 @@ static bool options_parse(int argc, char **argv) {
                         }
                         exit(0);
                     }
-                    else if (!strcmp(argv[0]+2, "all")) {
+                    else if (!strcmp(argv[0]+2, "ALL")) {
                         for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr)
                             opts_warn[itr] = 0xFFFFFFFFL;
                         break;
                     }
-                    if (!strncmp(argv[0]+2, "no-", 3)) {
+                    if (!strncmp(argv[0]+2, "NO_", 3)) {
                         if (!options_setwarn(argv[0]+5, false)) {
                             printf("unknown warning: %s\n", argv[0]+2);
                             return false;
@@ -308,7 +308,7 @@ static bool options_parse(int argc, char **argv) {
     return true;
 }
 
-static void options_setflag(uint32_t *flags, size_t idx, bool on)
+static void options_set(uint32_t *flags, size_t idx, bool on)
 {
     longbit lb = LONGBIT(idx);
 #if 0
@@ -334,7 +334,7 @@ int main(int argc, char **argv) {
     app_name = argv[0];
 
     /* default options / warn flags */
-    options_setflag(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
+    options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true);
 
     if (!options_parse(argc, argv)) {
         return usage();