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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
ovsdb
/
ovsdb-client.c
diff --git
a/ovsdb/ovsdb-client.c
b/ovsdb/ovsdb-client.c
index
81dcc77
..
67d09cb
100644
(file)
--- a/
ovsdb/ovsdb-client.c
+++ b/
ovsdb/ovsdb-client.c
@@
-69,7
+69,7
@@
static bool timestamp;
/* Format for table output. */
static struct table_style table_style = TABLE_STYLE_DEFAULT;
/* Format for table output. */
static struct table_style table_style = TABLE_STYLE_DEFAULT;
-static const struct ovsdb_client_command
all_commands[]
;
+static const struct ovsdb_client_command
*get_all_commands(void)
;
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
@@
-92,7
+92,7
@@
main(int argc, char *argv[])
ovs_fatal(0, "missing command name; use --help for help");
}
ovs_fatal(0, "missing command name; use --help for help");
}
- for (command =
all_commands
; ; command++) {
+ for (command =
get_all_commands()
; ; command++) {
if (!command->name) {
VLOG_FATAL("unknown command '%s'; use --help for help",
argv[optind]);
if (!command->name) {
VLOG_FATAL("unknown command '%s'; use --help for help",
argv[optind]);
@@
-392,7
+392,7
@@
fetch_dbs(struct jsonrpc *rpc, struct svec *dbs)
svec_add(dbs, name->u.string);
}
jsonrpc_msg_destroy(reply);
svec_add(dbs, name->u.string);
}
jsonrpc_msg_destroy(reply);
- svec_sort(
&
dbs);
+ svec_sort(dbs);
}
\f
static void
}
\f
static void
@@
-997,3
+997,8
@@
static const struct ovsdb_client_command all_commands[] = {
{ NULL, 0, 0, 0, NULL },
};
{ NULL, 0, 0, 0, NULL },
};
+
+static const struct ovsdb_client_command *get_all_commands(void)
+{
+ return all_commands;
+}