Make most "struct option" instances "const".

Reducing non-const static data makes code more obviously thread-safe.
Although option parsing does not normally need to be thread-safe, I
don't know of a drawback to making its data const.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index 37bd1aa2fcb408dfd919906139e786637b370be5..53e6bb9c373e206c690766a33378ba1229fbefa3 100644 (file)
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -166,7 +166,7 @@ parse_options(int argc, char *argv[])
         DAEMON_OPTION_ENUMS,
         TABLE_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"verbose", optional_argument, NULL, 'v'},
         {"help", no_argument, NULL, 'h'},
         {"version", no_argument, NULL, 'V'},

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index a8daf1f593ee7604707d67625174d376e9641941..1ba7c3cfca8396c2b3723ce6af2038f4c725ddb8 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -980,7 +980,7 @@ parse_options(int *argcp, char **argvp[],
         LEAK_CHECKER_OPTION_ENUMS,
         DAEMON_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"remote",      required_argument, NULL, OPT_REMOTE},
         {"unixctl",     required_argument, NULL, OPT_UNIXCTL},
         {"run",         required_argument, NULL, OPT_RUN},

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index fe6ab423f151eb6280165032d19b7c6daecebab5..2ef4061aaf95d8782b635b145c6853623afc0ab3 100644 (file)
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -66,7 +66,7 @@ main(int argc, char *argv[])
 static void
 parse_options(int argc, char *argv[])
 {
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"more", no_argument, NULL, 'm'},
         {"verbose", optional_argument, NULL, 'v'},
         {"help", no_argument, NULL, 'h'},

diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index 7cc708a50a7a7f08f84838c2db77193fdb5ac70c..616ff2e0491e0bfcd10936be022e0454c87e3617 100644 (file)
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ parse_options(int argc, char *argv[])
         OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1,
         DAEMON_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"verbose", optional_argument, NULL, 'v'},
         {"help", no_argument, NULL, 'h'},
         DAEMON_LONG_OPTIONS,

diff --git a/tests/test-netflow.c b/tests/test-netflow.c
index 6e5b0be6238731b5e2c4e0dbdf8192f1e029889f..921f0fd7708a074e538cf08fbf4dac2af1093798 100644 (file)
--- a/tests/test-netflow.c
+++ b/tests/test-netflow.c
@@ -237,7 +237,7 @@ parse_options(int argc, char *argv[])
         DAEMON_OPTION_ENUMS,
         VLOG_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"help", no_argument, NULL, 'h'},
         DAEMON_LONG_OPTIONS,
         VLOG_LONG_OPTIONS,

diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 658259e8fd92a6d16ab28da30dd40baaec28860c..10d434e198647d5bfd4030d517731d8f9da71e10 100644 (file)
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.c
@@ -68,7 +68,7 @@ main(int argc, char *argv[])
 static void
 parse_options(int argc, char *argv[])
 {
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"timeout", required_argument, NULL, 't'},
         {"verbose", optional_argument, NULL, 'v'},
         {"help", no_argument, NULL, 'h'},

diff --git a/tests/test-sflow.c b/tests/test-sflow.c
index 838fa62a67fba0b57132f41ae08143afd2964413..edb996ce3dc5e548e9b07ff2b9d342dcbb6c4c82 100644 (file)
--- a/tests/test-sflow.c
+++ b/tests/test-sflow.c
@@ -559,7 +559,7 @@ parse_options(int argc, char *argv[])
         DAEMON_OPTION_ENUMS,
         VLOG_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"verbose", optional_argument, NULL, 'v'},
         {"help", no_argument, NULL, 'h'},
         DAEMON_LONG_OPTIONS,

diff --git a/tests/test-util.c b/tests/test-util.c
index 3eecc7a4cd62bf3832e78bdb724d61f573864b97..3422af3a2776587b87016090e7bdca6d3f3e10d4 100644 (file)
--- a/tests/test-util.c
+++ b/tests/test-util.c
@@ -363,7 +363,7 @@ parse_options(int argc, char *argv[])
     enum {
         VLOG_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         VLOG_LONG_OPTIONS,
         {NULL, 0, NULL, 0},
     };

diff --git a/utilities/ovs-benchmark.c b/utilities/ovs-benchmark.c
index 8bea9f085ac402b184115ee8151f18bd10edee82..d1bdaace5ea64181dd7084e1ce03f4f84846b964 100644 (file)
--- a/utilities/ovs-benchmark.c
+++ b/utilities/ovs-benchmark.c
@@ -118,7 +118,7 @@ parse_target(const char *s_, struct in_addr *addr,
 static void
 parse_options(int argc, char *argv[])
 {
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"local", required_argument, NULL, 'l'},
         {"remote", required_argument, NULL, 'r'},
         {"batches", required_argument, NULL, 'b'},

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 51765bd04e4e459e71cfc6a67593615eb1082f7f..70bc2e65201e6d57363d4f8655cf4bc1b4c30ebe 100644 (file)
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -255,7 +255,7 @@ parse_options(int argc, char *argv[])
         DAEMON_OPTION_ENUMS,
         OFP_VERSION_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"hub",         no_argument, NULL, 'H'},
         {"noflow",      no_argument, NULL, 'n'},
         {"normal",      no_argument, NULL, 'N'},

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index 3b6e6a5bd23272a2fc456fc4068a9a2f01fd943b..2f9574f005bf28aa1596443fd00a806ece2cc07a 100644 (file)
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -89,7 +89,7 @@ parse_options(int argc, char *argv[])
         OPT_MAY_CREATE,
         VLOG_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"statistics", no_argument, NULL, 's'},
         {"clear", no_argument, NULL, OPT_CLEAR},
         {"may-create", no_argument, NULL, OPT_MAY_CREATE},

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 409d6408a44c9693980aff989df80bc3d67d7b14..9f97bbc6c6189d98fc9f18ce4e620fbac1ccbe3b 100644 (file)
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -151,7 +151,7 @@ parse_options(int argc, char *argv[])
         OFP_VERSION_OPTION_ENUMS,
         VLOG_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"timeout", required_argument, NULL, 't'},
         {"strict", no_argument, NULL, OPT_STRICT},
         {"readd", no_argument, NULL, OPT_READD},

diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
index 9736b79e0c4198bc884e0209a5bec823fdf193a3..78ebd3194a1e3d682cc42fc43c3860c31e755be1 100644 (file)
--- a/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@ -159,7 +159,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp)
         OPT_DISABLE_SYSTEM,
         DAEMON_OPTION_ENUMS
     };
-    static struct option long_options[] = {
+    static const struct option long_options[] = {
         {"help",        no_argument, NULL, 'h'},
         {"version",     no_argument, NULL, 'V'},
         {"mlockall",    no_argument, NULL, OPT_MLOCKALL},