projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Add new "mutation" operation to transactions.
[openvswitch]
/
ovsdb
/
ovsdb-server.c
diff --git
a/ovsdb/ovsdb-server.c
b/ovsdb/ovsdb-server.c
index d80161b2dfb70730a27e81775de6258464e07223..3bd5bc50c723aff295d607ab4862f5778fad658a 100644
(file)
--- a/
ovsdb/ovsdb-server.c
+++ b/
ovsdb/ovsdb-server.c
@@
-44,8
+44,6
@@
#include "vlog.h"
#define THIS_MODULE VLM_ovsdb_server
#include "vlog.h"
#define THIS_MODULE VLM_ovsdb_server
-static const struct jsonrpc_server_cbs ovsdb_jsonrpc_cbs;
-
static unixctl_cb_func ovsdb_server_exit;
static void parse_options(int argc, char *argv[], char **file_namep,
static unixctl_cb_func ovsdb_server_exit;
static void parse_options(int argc, char *argv[], char **file_namep,
@@
-128,7
+126,7
@@
main(int argc, char *argv[])
unixctl_command_register("exit", ovsdb_server_exit, &exiting);
if (do_chdir) {
unixctl_command_register("exit", ovsdb_server_exit, &exiting);
if (do_chdir) {
-
chdir("/"
);
+
ignore(chdir("/")
);
}
exiting = false;
}
exiting = false;
@@
-227,9
+225,11
@@
parse_options(int argc, char *argv[], char **file_namep,
argc -= optind;
argv += optind;
argc -= optind;
argv += optind;
- if (argc
!=
1) {
+ if (argc
>
1) {
ovs_fatal(0, "database file is only non-option argument; "
"use --help for usage");
ovs_fatal(0, "database file is only non-option argument; "
"use --help for usage");
+ } else if (argc < 1) {
+ ovs_fatal(0, "missing database file argument; use --help for usage");
}
*file_namep = argv[0];
}
*file_namep = argv[0];