diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-05-04 13:49:42 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-05-16 13:40:47 -0700 |
| commit | e3c17733704fd54fa937ed5e1e8c4b51e00961f1 (patch) | |
| tree | 78dd7e21f574d1a4614df73fd79e0b239e93201c /utilities/ovs-openflowd.c | |
| parent | 1102893de4f14a2d184afc640c9a1edf778c6a93 (diff) | |
| download | openvswitch-e3c17733704fd54fa937ed5e1e8c4b51e00961f1.tar.gz | |
Consistently write null pointer constants as NULL instead of 0.
Found with sparse.
Diffstat (limited to 'utilities/ovs-openflowd.c')
| -rw-r--r-- | utilities/ovs-openflowd.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 33ebc6815..aab5a2b07 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -249,37 +249,37 @@ parse_options(int argc, char *argv[], struct ofsettings *s) DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, - {"mfr-desc", required_argument, 0, OPT_MFR_DESC}, - {"hw-desc", required_argument, 0, OPT_HW_DESC}, - {"sw-desc", required_argument, 0, OPT_SW_DESC}, - {"serial-desc", required_argument, 0, OPT_SERIAL_DESC}, - {"dp-desc", required_argument, 0, OPT_DP_DESC}, - {"config", required_argument, 0, 'F'}, - {"br-name", required_argument, 0, OPT_BR_NAME}, - {"fail", required_argument, 0, OPT_FAIL_MODE}, - {"inactivity-probe", required_argument, 0, OPT_INACTIVITY_PROBE}, - {"max-idle", required_argument, 0, OPT_MAX_IDLE}, - {"max-backoff", required_argument, 0, OPT_MAX_BACKOFF}, - {"listen", required_argument, 0, 'l'}, - {"snoop", required_argument, 0, OPT_SNOOP}, - {"rate-limit", optional_argument, 0, OPT_RATE_LIMIT}, - {"burst-limit", required_argument, 0, OPT_BURST_LIMIT}, - {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND}, - {"in-band", no_argument, 0, OPT_IN_BAND}, - {"netflow", required_argument, 0, OPT_NETFLOW}, - {"ports", required_argument, 0, OPT_PORTS}, - {"unixctl", required_argument, 0, OPT_UNIXCTL}, - {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"datapath-id", required_argument, NULL, OPT_DATAPATH_ID}, + {"mfr-desc", required_argument, NULL, OPT_MFR_DESC}, + {"hw-desc", required_argument, NULL, OPT_HW_DESC}, + {"sw-desc", required_argument, NULL, OPT_SW_DESC}, + {"serial-desc", required_argument, NULL, OPT_SERIAL_DESC}, + {"dp-desc", required_argument, NULL, OPT_DP_DESC}, + {"config", required_argument, NULL, 'F'}, + {"br-name", required_argument, NULL, OPT_BR_NAME}, + {"fail", required_argument, NULL, OPT_FAIL_MODE}, + {"inactivity-probe", required_argument, NULL, OPT_INACTIVITY_PROBE}, + {"max-idle", required_argument, NULL, OPT_MAX_IDLE}, + {"max-backoff", required_argument, NULL, OPT_MAX_BACKOFF}, + {"listen", required_argument, NULL, 'l'}, + {"snoop", required_argument, NULL, OPT_SNOOP}, + {"rate-limit", optional_argument, NULL, OPT_RATE_LIMIT}, + {"burst-limit", required_argument, NULL, OPT_BURST_LIMIT}, + {"out-of-band", no_argument, NULL, OPT_OUT_OF_BAND}, + {"in-band", no_argument, NULL, OPT_IN_BAND}, + {"netflow", required_argument, NULL, OPT_NETFLOW}, + {"ports", required_argument, NULL, OPT_PORTS}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, + {"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY}, + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS, - {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, - {0, 0, 0, 0}, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); struct ofproto_controller controller_opts; |