fix mutex_trylock bug

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index e814f0efbd1bdf4444b9c0895d673b01df223458..b0931f757e860a778c46e347dde08f87e978abe0 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -55,7 +55,7 @@ static void print_usage(struct model_params *params)
                "                            Default: %u\n"
                "                            -o help for a list of options\n"
                "-n                          No fork\n"
-               "-m, --minsize=NUM           Minimum number of actions to keep\n",
+               "-m, --minsize=NUM           Minimum number of actions to keep\n"
                "                            Default: %u\n"
                "-f, --freqfree=NUM          Frequency to free actions\n"
                "                            Default: %u\n"
@@ -88,20 +88,19 @@ bool install_plugin(char * name) {
 }
 
 void parse_options(struct model_params *params) {
-       const char *shortopts = "hrnt:o:x:v:m:f::";
+       const char *shortopts = "hrnt:o:x:v:m:f:";
        const struct option longopts[] = {
                {"help", no_argument, NULL, 'h'},
-               {"verbose", optional_argument, NULL, 'v'},
+               {"removevisible", no_argument, NULL, 'r'},
                {"analysis", required_argument, NULL, 't'},
                {"options", required_argument, NULL, 'o'},
                {"maxexecutions", required_argument, NULL, 'x'},
+               {"verbose", optional_argument, NULL, 'v'},
                {"minsize", required_argument, NULL, 'm'},
                {"freqfree", required_argument, NULL, 'f'},
-               {"removevisible", no_argument, NULL, 'r'},
                {0, 0, 0, 0}    /* Terminator */
        };
        int opt, longindex;
-       int tmpoptind = optind;
        bool error = false;
        char * options = getenv("C11TESTER");
 
@@ -167,8 +166,8 @@ void parse_options(struct model_params *params) {
                }
        }
 
-       /* Restore (global) optind for potential use by user program */
-       optind = tmpoptind;
+       /* Special value to reset implementation as described by Linux man page.  */
+       optind = 0;
 
        if (error)
                print_usage(params);