projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Unit test autopath action parsing.
[openvswitch]
/
ovsdb
/
ovsdb-client.c
diff --git
a/ovsdb/ovsdb-client.c
b/ovsdb/ovsdb-client.c
index a66b013bf8116b128a4c8601a863d8fc82986bf2..800d3e1729867db5ca5ee0928fec0a8c2149c630 100644
(file)
--- a/
ovsdb/ovsdb-client.c
+++ b/
ovsdb/ovsdb-client.c
@@
-74,16
+74,16
@@
parse_options(int argc, char *argv[])
TABLE_OPTION_ENUMS
};
static struct option long_options[] = {
TABLE_OPTION_ENUMS
};
static struct option long_options[] = {
- {"verbose", optional_argument,
0
, 'v'},
- {"help", no_argument,
0
, 'h'},
- {"version", no_argument,
0
, 'V'},
+ {"verbose", optional_argument,
NULL
, 'v'},
+ {"help", no_argument,
NULL
, 'h'},
+ {"version", no_argument,
NULL
, 'V'},
DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
- {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
- TABLE_LONG_OPTIONS,
- STREAM_SSL_LONG_OPTIONS
+ {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
+ STREAM_SSL_LONG_OPTIONS,
#endif
#endif
- {0, 0, 0, 0},
+ TABLE_LONG_OPTIONS,
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
};
char *short_options = long_options_to_short_options(long_options);
@@
-111,13
+111,11
@@
parse_options(int argc, char *argv[])
TABLE_OPTION_HANDLERS(&table_style)
TABLE_OPTION_HANDLERS(&table_style)
-#ifdef HAVE_OPENSSL
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
stream_ssl_set_ca_cert_file(optarg, true);
break;
-#endif
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);