mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 16:25:17 +00:00
Code Issues Releases Wiki Activity

Consistently write null pointer constants as NULL instead of 0.

Browse Source 
Found with sparse.
This commit is contained in:
Ben Pfaff
2011-05-04 13:49:42 -07:00
parent 1102893de4
commit e3c1773370
24 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/daemon.h
View File

@@ -28,12 +28,12 @@
OPT_PIDFILE, \ OPT_PIDFILE, \
OPT_MONITOR OPT_MONITOR
#define DAEMON_LONG_OPTIONS \ #define DAEMON_LONG_OPTIONS \
{"detach", no_argument, 0, OPT_DETACH}, \ {"detach", no_argument, NULL, OPT_DETACH}, \
{"no-chdir", no_argument, 0, OPT_NO_CHDIR}, \ {"no-chdir", no_argument, NULL, OPT_NO_CHDIR}, \
{"pidfile", optional_argument, 0, OPT_PIDFILE}, \ {"pidfile", optional_argument, NULL, OPT_PIDFILE}, \
{"overwrite-pidfile", no_argument, 0, OPT_OVERWRITE_PIDFILE},\ {"overwrite-pidfile", no_argument, NULL, OPT_OVERWRITE_PIDFILE}, \
{"monitor", no_argument, 0, OPT_MONITOR} {"monitor", no_argument, NULL, OPT_MONITOR}
#define DAEMON_OPTION_HANDLERS \ #define DAEMON_OPTION_HANDLERS \
case OPT_DETACH: \ case OPT_DETACH: \

6
lib/leak-checker.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2009 Nicira Networks. * Copyright (c) 2008, 2009, 2011 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
OPT_CHECK_LEAKS, \ OPT_CHECK_LEAKS, \
OPT_LEAK_LIMIT OPT_LEAK_LIMIT
#define LEAK_CHECKER_LONG_OPTIONS \ #define LEAK_CHECKER_LONG_OPTIONS \
{"check-leaks", required_argument, 0, OPT_CHECK_LEAKS}, \ {"check-leaks", required_argument, NULL, OPT_CHECK_LEAKS}, \
{"leak-limit", required_argument, 0, OPT_LEAK_LIMIT} {"leak-limit", required_argument, NULL, OPT_LEAK_LIMIT}
#define LEAK_CHECKER_OPTION_HANDLERS \ #define LEAK_CHECKER_OPTION_HANDLERS \
case OPT_CHECK_LEAKS: \ case OPT_CHECK_LEAKS: \
leak_checker_start(optarg); \ leak_checker_start(optarg); \

2
lib/rtnetlink.c
View File

@@ -55,7 +55,7 @@ rtnetlink_create(int multicast_group, rtnetlink_parse_func *parse,
struct rtnetlink *rtn; struct rtnetlink *rtn;
rtn = xzalloc(sizeof *rtn); rtn = xzalloc(sizeof *rtn);
rtn->notify_sock = 0; rtn->notify_sock = NULL;
rtn->multicast_group = multicast_group; rtn->multicast_group = multicast_group;
rtn->parse = parse; rtn->parse = parse;
rtn->change = change; rtn->change = change;

6
lib/stream-ssl.h
View File

@@ -27,9 +27,9 @@ void stream_ssl_set_key_and_cert(const char *private_key_file,
const char *certificate_file); const char *certificate_file);
#define STREAM_SSL_LONG_OPTIONS \ #define STREAM_SSL_LONG_OPTIONS \
{"private-key", required_argument, 0, 'p'}, \ {"private-key", required_argument, NULL, 'p'}, \
{"certificate", required_argument, 0, 'c'}, \ {"certificate", required_argument, NULL, 'c'}, \
{"ca-cert", required_argument, 0, 'C'} {"ca-cert", required_argument, NULL, 'C'}
#define STREAM_SSL_OPTION_HANDLERS \ #define STREAM_SSL_OPTION_HANDLERS \
case 'p': \ case 'p': \

12
lib/table.h
View File

@@ -85,12 +85,12 @@ struct table_style {
OPT_PRETTY, \ OPT_PRETTY, \
OPT_BARE OPT_BARE
#define TABLE_LONG_OPTIONS \ #define TABLE_LONG_OPTIONS \
{"format", required_argument, 0, 'f'}, \ {"format", required_argument, NULL, 'f'}, \
{"data", required_argument, 0, 'd'}, \ {"data", required_argument, NULL, 'd'}, \
{"no-headings", no_argument, 0, OPT_NO_HEADINGS}, \ {"no-headings", no_argument, NULL, OPT_NO_HEADINGS}, \
{"pretty", no_argument, 0, OPT_PRETTY}, \ {"pretty", no_argument, NULL, OPT_PRETTY}, \
{"bare", no_argument, 0, OPT_BARE} {"bare", no_argument, NULL, OPT_BARE}
#define TABLE_OPTION_HANDLERS(STYLE) \ #define TABLE_OPTION_HANDLERS(STYLE) \
case 'f': \ case 'f': \

4
lib/vlog.h
View File

@@ -222,8 +222,8 @@ void vlog_rate_limit(const struct vlog_module *, enum vlog_level,
/* Command line processing. */ /* Command line processing. */
#define VLOG_OPTION_ENUMS OPT_LOG_FILE #define VLOG_OPTION_ENUMS OPT_LOG_FILE
#define VLOG_LONG_OPTIONS \ #define VLOG_LONG_OPTIONS \
{"verbose", optional_argument, 0, 'v'}, \ {"verbose", optional_argument, NULL, 'v'}, \
{"log-file", optional_argument, 0, OPT_LOG_FILE} {"log-file", optional_argument, NULL, OPT_LOG_FILE}
#define VLOG_OPTION_HANDLERS \ #define VLOG_OPTION_HANDLERS \
case 'v': \ case 'v': \
vlog_set_verbosity(optarg); \ vlog_set_verbosity(optarg); \

6
ovsdb/log.c
View File

@@ -289,7 +289,7 @@ ovsdb_log_read(struct ovsdb_log *file, struct json **jsonp)
file->prev_offset = file->offset; file->prev_offset = file->offset;
file->offset = data_offset + data_length; file->offset = data_offset + data_length;
*jsonp = json; *jsonp = json;
return 0; return NULL;
error: error:
file->read_error = ovsdb_error_clone(error); file->read_error = ovsdb_error_clone(error);
@@ -372,7 +372,7 @@ ovsdb_log_write(struct ovsdb_log *file, struct json *json)
file->offset += strlen(header) + length; file->offset += strlen(header) + length;
free(json_string); free(json_string);
return 0; return NULL;
error: error:
file->write_error = ovsdb_error_clone(error); file->write_error = ovsdb_error_clone(error);
@@ -386,7 +386,7 @@ ovsdb_log_commit(struct ovsdb_log *file)
if (fsync(fileno(file->stream))) { if (fsync(fileno(file->stream))) {
return ovsdb_io_error(errno, "%s: fsync failed", file->name); return ovsdb_io_error(errno, "%s: fsync failed", file->name);
} }
return 0; return NULL;
} }
/* Returns the current offset into the file backing 'log', in bytes. This /* Returns the current offset into the file backing 'log', in bytes. This

10
ovsdb/ovsdb-client.c
View File

@@ -74,16 +74,16 @@ parse_options(int argc, char *argv[])
TABLE_OPTION_ENUMS TABLE_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"verbose", optional_argument, 0, 'v'}, {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
#endif #endif
TABLE_LONG_OPTIONS, TABLE_LONG_OPTIONS,
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

22
ovsdb/ovsdb-server.c
View File

@@ -344,7 +344,7 @@ read_string_column(const struct ovsdb_row *row, const char *column_name,
const union ovsdb_atom *atom; const union ovsdb_atom *atom;
atom = read_column(row, column_name, OVSDB_TYPE_STRING); atom = read_column(row, column_name, OVSDB_TYPE_STRING);
*stringp = atom ? atom->string : 0; *stringp = atom ? atom->string : NULL;
return atom != NULL; return atom != NULL;
} }
@@ -659,19 +659,19 @@ parse_options(int argc, char *argv[], char **file_namep,
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"remote", required_argument, 0, OPT_REMOTE}, {"remote", required_argument, NULL, OPT_REMOTE},
{"unixctl", required_argument, 0, OPT_UNIXCTL}, {"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"run", required_argument, 0, OPT_RUN}, {"run", required_argument, NULL, OPT_RUN},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS,
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"private-key", required_argument, 0, 'p'}, {"private-key", required_argument, NULL, 'p'},
{"certificate", required_argument, 0, 'c'}, {"certificate", required_argument, NULL, 'c'},
{"ca-cert", required_argument, 0, 'C'}, {"ca-cert", required_argument, NULL, 'C'},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

10
ovsdb/ovsdb-tool.c
View File

@@ -60,11 +60,11 @@ static void
parse_options(int argc, char *argv[]) parse_options(int argc, char *argv[])
{ {
static struct option long_options[] = { static struct option long_options[] = {
{"more", no_argument, 0, 'm'}, {"more", no_argument, NULL, 'm'},
{"verbose", optional_argument, 0, 'v'}, {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

2
ovsdb/ovsdb.c
View File

@@ -253,7 +253,7 @@ ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
} }
*schemap = schema; *schemap = schema;
return 0; return NULL;
} }
struct json * struct json *

2
ovsdb/table.c
View File

@@ -157,7 +157,7 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name,
add_column(ts, column); add_column(ts, column);
} }
*tsp = ts; *tsp = ts;
return 0; return NULL;
} }
/* Returns table schema 'ts' serialized into JSON. /* Returns table schema 'ts' serialized into JSON.

8
tests/test-jsonrpc.c
View File

@@ -57,12 +57,12 @@ parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"verbose", optional_argument, 0, 'v'}, {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

4
tests/test-lockfile.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009, 2010 Nicira Networks. * Copyright (c) 2009, 2010, 2011 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -231,7 +231,7 @@ static const struct test tests[] = {
TEST(lock_timeout_runs_out), TEST(lock_timeout_runs_out),
TEST(lock_multiple), TEST(lock_multiple),
TEST(help), TEST(help),
{ 0, 0 } { NULL, NULL }
#undef TEST #undef TEST
}; };

8
tests/test-ovsdb.c
View File

@@ -68,10 +68,10 @@ static void
parse_options(int argc, char *argv[]) parse_options(int argc, char *argv[])
{ {
static struct option long_options[] = { static struct option long_options[] = {
{"timeout", required_argument, 0, 't'}, {"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, 0, 'v'}, {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

4
utilities/ovs-appctl.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2009, 2010 Nicira Networks. * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ parse_command_line(int argc, char *argv[])
{"execute", no_argument, NULL, 'e'}, {"execute", no_argument, NULL, 'e'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'}, {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
const char *target; const char *target;
int e_options; int e_options;

28
utilities/ovs-controller.c
View File

@@ -310,23 +310,23 @@ parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"hub", no_argument, 0, 'H'}, {"hub", no_argument, NULL, 'H'},
{"noflow", no_argument, 0, 'n'}, {"noflow", no_argument, NULL, 'n'},
{"normal", no_argument, 0, 'N'}, {"normal", no_argument, NULL, 'N'},
{"wildcard", no_argument, 0, 'w'}, {"wildcard", no_argument, NULL, 'w'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE}, {"max-idle", required_argument, NULL, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE}, {"mute", no_argument, NULL, OPT_MUTE},
{"queue", required_argument, 0, 'q'}, {"queue", required_argument, NULL, 'q'},
{"port-queue", required_argument, 0, 'Q'}, {"port-queue", required_argument, NULL, 'Q'},
{"with-flows", required_argument, 0, OPT_WITH_FLOWS}, {"with-flows", required_argument, NULL, OPT_WITH_FLOWS},
{"unixctl", required_argument, 0, OPT_UNIXCTL}, {"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

10
utilities/ovs-dpctl.c
View File

@@ -71,12 +71,12 @@ parse_options(int argc, char *argv[])
VLOG_OPTION_ENUMS VLOG_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"statistics", no_argument, 0, 's'}, {"statistics", no_argument, NULL, 's'},
{"timeout", required_argument, 0, 't'}, {"timeout", required_argument, NULL, 't'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

14
utilities/ovs-ofctl.c
View File

@@ -85,15 +85,15 @@ parse_options(int argc, char *argv[])
VLOG_OPTION_ENUMS VLOG_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"timeout", required_argument, 0, 't'}, {"timeout", required_argument, NULL, 't'},
{"strict", no_argument, 0, OPT_STRICT}, {"strict", no_argument, NULL, OPT_STRICT},
{"flow-format", required_argument, 0, 'F'}, {"flow-format", required_argument, NULL, 'F'},
{"more", no_argument, 0, 'm'}, {"more", no_argument, NULL, 'm'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

54
utilities/ovs-openflowd.c
View File

@@ -249,37 +249,37 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, {"datapath-id", required_argument, NULL, OPT_DATAPATH_ID},
{"mfr-desc", required_argument, 0, OPT_MFR_DESC}, {"mfr-desc", required_argument, NULL, OPT_MFR_DESC},
{"hw-desc", required_argument, 0, OPT_HW_DESC}, {"hw-desc", required_argument, NULL, OPT_HW_DESC},
{"sw-desc", required_argument, 0, OPT_SW_DESC}, {"sw-desc", required_argument, NULL, OPT_SW_DESC},
{"serial-desc", required_argument, 0, OPT_SERIAL_DESC}, {"serial-desc", required_argument, NULL, OPT_SERIAL_DESC},
{"dp-desc", required_argument, 0, OPT_DP_DESC}, {"dp-desc", required_argument, NULL, OPT_DP_DESC},
{"config", required_argument, 0, 'F'}, {"config", required_argument, NULL, 'F'},
{"br-name", required_argument, 0, OPT_BR_NAME}, {"br-name", required_argument, NULL, OPT_BR_NAME},
{"fail", required_argument, 0, OPT_FAIL_MODE}, {"fail", required_argument, NULL, OPT_FAIL_MODE},
{"inactivity-probe", required_argument, 0, OPT_INACTIVITY_PROBE}, {"inactivity-probe", required_argument, NULL, OPT_INACTIVITY_PROBE},
{"max-idle", required_argument, 0, OPT_MAX_IDLE}, {"max-idle", required_argument, NULL, OPT_MAX_IDLE},
{"max-backoff", required_argument, 0, OPT_MAX_BACKOFF}, {"max-backoff", required_argument, NULL, OPT_MAX_BACKOFF},
{"listen", required_argument, 0, 'l'}, {"listen", required_argument, NULL, 'l'},
{"snoop", required_argument, 0, OPT_SNOOP}, {"snoop", required_argument, NULL, OPT_SNOOP},
{"rate-limit", optional_argument, 0, OPT_RATE_LIMIT}, {"rate-limit", optional_argument, NULL, OPT_RATE_LIMIT},
{"burst-limit", required_argument, 0, OPT_BURST_LIMIT}, {"burst-limit", required_argument, NULL, OPT_BURST_LIMIT},
{"out-of-band", no_argument, 0, OPT_OUT_OF_BAND}, {"out-of-band", no_argument, NULL, OPT_OUT_OF_BAND},
{"in-band", no_argument, 0, OPT_IN_BAND}, {"in-band", no_argument, NULL, OPT_IN_BAND},
{"netflow", required_argument, 0, OPT_NETFLOW}, {"netflow", required_argument, NULL, OPT_NETFLOW},
{"ports", required_argument, 0, OPT_PORTS}, {"ports", required_argument, NULL, OPT_PORTS},
{"unixctl", required_argument, 0, OPT_UNIXCTL}, {"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, {"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY},
{"verbose", optional_argument, 0, 'v'}, {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);
struct ofproto_controller controller_opts; struct ofproto_controller controller_opts;

2
utilities/ovs-vlan-bug-workaround.c
View File

@@ -113,7 +113,7 @@ parse_options(int argc, char *argv[])
static const struct option long_options[] = { static const struct option long_options[] = {
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'}, {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

26
utilities/ovs-vsctl.c
View File

@@ -207,19 +207,19 @@ parse_options(int argc, char *argv[])
TABLE_OPTION_ENUMS TABLE_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"db", required_argument, 0, OPT_DB}, {"db", required_argument, NULL, OPT_DB},
{"no-syslog", no_argument, 0, OPT_NO_SYSLOG}, {"no-syslog", no_argument, NULL, OPT_NO_SYSLOG},
{"no-wait", no_argument, 0, OPT_NO_WAIT}, {"no-wait", no_argument, NULL, OPT_NO_WAIT},
{"dry-run", no_argument, 0, OPT_DRY_RUN}, {"dry-run", no_argument, NULL, OPT_DRY_RUN},
{"oneline", no_argument, 0, OPT_ONELINE}, {"oneline", no_argument, NULL, OPT_ONELINE},
{"timeout", required_argument, 0, 't'}, {"timeout", required_argument, NULL, 't'},
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
TABLE_LONG_OPTIONS, TABLE_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *tmp, *short_options; char *tmp, *short_options;
@@ -1111,7 +1111,7 @@ cmd_emer_reset(struct vsctl_context *ctx)
static void static void
cmd_add_br(struct vsctl_context *ctx) cmd_add_br(struct vsctl_context *ctx)
{ {
bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL;
const char *br_name, *parent_name; const char *br_name, *parent_name;
struct vsctl_info info; struct vsctl_info info;
int vlan; int vlan;
@@ -1563,7 +1563,7 @@ add_port(struct vsctl_context *ctx,
static void static void
cmd_add_port(struct vsctl_context *ctx) cmd_add_port(struct vsctl_context *ctx)
{ {
bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL;
add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, false, add_port(ctx, ctx->argv[1], ctx->argv[2], may_exist, false,
&ctx->argv[2], 1, &ctx->argv[3], ctx->argc - 3); &ctx->argv[2], 1, &ctx->argv[3], ctx->argc - 3);
@@ -1572,7 +1572,7 @@ cmd_add_port(struct vsctl_context *ctx)
static void static void
cmd_add_bond(struct vsctl_context *ctx) cmd_add_bond(struct vsctl_context *ctx)
{ {
bool may_exist = shash_find(&ctx->options, "--may-exist") != 0; bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL;
bool fake_iface = shash_find(&ctx->options, "--fake-iface"); bool fake_iface = shash_find(&ctx->options, "--fake-iface");
int n_ifaces; int n_ifaces;
int i; int i;

10
vswitchd/ovs-brcompatd.c
View File

@@ -1398,14 +1398,14 @@ parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
{"prune-timeout", required_argument, 0, OPT_PRUNE_TIMEOUT}, {"prune-timeout", required_argument, NULL, OPT_PRUNE_TIMEOUT},
{"appctl-command", required_argument, 0, OPT_APPCTL_COMMAND}, {"appctl-command", required_argument, NULL, OPT_APPCTL_COMMAND},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS,
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);

14
vswitchd/ovs-vswitchd.c
View File

@@ -122,17 +122,17 @@ parse_options(int argc, char *argv[])
DAEMON_OPTION_ENUMS DAEMON_OPTION_ENUMS
}; };
static struct option long_options[] = { static struct option long_options[] = {
{"help", no_argument, 0, 'h'}, {"help", no_argument, NULL, 'h'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, NULL, 'V'},
{"mlockall", no_argument, 0, OPT_MLOCKALL}, {"mlockall", no_argument, NULL, OPT_MLOCKALL},
DAEMON_LONG_OPTIONS, DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS, VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, {"enable-dummy", no_argument, NULL, OPT_ENABLE_DUMMY},
{0, 0, 0, 0}, {NULL, 0, NULL, 0},
}; };
char *short_options = long_options_to_short_options(long_options); char *short_options = long_options_to_short_options(long_options);