git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
ovsdb
/
ovsdb-client.c
diff --git
a/ovsdb/ovsdb-client.c
b/ovsdb/ovsdb-client.c
index
f149eec
..
2942953
100644
(file)
--- a/
ovsdb/ovsdb-client.c
+++ b/
ovsdb/ovsdb-client.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013
, 2014
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-31,6
+31,7
@@
#include "daemon.h"
#include "dirs.h"
#include "dynamic-string.h"
#include "daemon.h"
#include "dirs.h"
#include "dynamic-string.h"
+#include "fatal-signal.h"
#include "json.h"
#include "jsonrpc.h"
#include "lib/table.h"
#include "json.h"
#include "jsonrpc.h"
#include "lib/table.h"
@@
-88,7
+89,7
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
-
signal(SIGPIPE, SIG_IGN
);
+
fatal_ignore_sigpipe(
);
if (optind >= argc) {
ovs_fatal(0, "missing command name; use --help for help");
if (optind >= argc) {
ovs_fatal(0, "missing command name; use --help for help");
@@
-165,14
+166,15
@@
parse_options(int argc, char *argv[])
enum {
OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1,
OPT_TIMESTAMP,
enum {
OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1,
OPT_TIMESTAMP,
+ VLOG_OPTION_ENUMS,
DAEMON_OPTION_ENUMS,
TABLE_OPTION_ENUMS
};
static const struct option long_options[] = {
DAEMON_OPTION_ENUMS,
TABLE_OPTION_ENUMS
};
static const struct option long_options[] = {
- {"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{"timestamp", no_argument, NULL, OPT_TIMESTAMP},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{"timestamp", no_argument, NULL, OPT_TIMESTAMP},
+ VLOG_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
DAEMON_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
{"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
@@
-199,14
+201,9
@@
parse_options(int argc, char *argv[])
ovs_print_version(0, 0);
exit(EXIT_SUCCESS);
ovs_print_version(0, 0);
exit(EXIT_SUCCESS);
- case 'v':
- vlog_set_verbosity(optarg);
- break;
-
+ VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
-
TABLE_OPTION_HANDLERS(&table_style)
TABLE_OPTION_HANDLERS(&table_style)
-
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT:
STREAM_SSL_OPTION_HANDLERS
case OPT_BOOTSTRAP_CA_CERT: