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
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
tests
/
test-ovsdb.c
diff --git
a/tests/test-ovsdb.c
b/tests/test-ovsdb.c
index
658259e
..
29d7542
100644
(file)
--- a/
tests/test-ovsdb.c
+++ b/
tests/test-ovsdb.c
@@
-51,24
+51,23
@@
#include "util.h"
#include "vlog.h"
#include "util.h"
#include "vlog.h"
-static struct command all_commands[];
-
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[]);
+static struct command *get_all_commands(void);
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
parse_options(argc, argv);
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
parse_options(argc, argv);
- run_command(argc - optind, argv + optind,
all_commands
);
+ run_command(argc - optind, argv + optind,
get_all_commands()
);
return 0;
}
static void
parse_options(int argc, char *argv[])
{
return 0;
}
static void
parse_options(int argc, char *argv[])
{
- static struct option long_options[] = {
+ static
const
struct option long_options[] = {
{"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{"timeout", required_argument, NULL, 't'},
{"verbose", optional_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
@@
-218,16
+217,13
@@
unbox_json(struct json *json)
}
}
}
}
-static
size_t
+static
void
print_and_free_json(struct json *json)
{
char *string = json_to_string(json, JSSF_SORT);
print_and_free_json(struct json *json)
{
char *string = json_to_string(json, JSSF_SORT);
- size_t length = strlen(string);
json_destroy(json);
puts(string);
free(string);
json_destroy(json);
puts(string);
free(string);
-
- return length;
}
static void
}
static void
@@
-445,10
+441,7
@@
do_parse_atoms(int argc, char *argv[])
if (error) {
print_and_free_ovsdb_error(error);
} else {
if (error) {
print_and_free_ovsdb_error(error);
} else {
- size_t length;
-
- length = print_and_free_json(ovsdb_atom_to_json(&atom, base.type));
- ovs_assert(length == ovsdb_atom_json_length(&atom, base.type));
+ print_and_free_json(ovsdb_atom_to_json(&atom, base.type));
ovsdb_atom_destroy(&atom, base.type);
}
}
ovsdb_atom_destroy(&atom, base.type);
}
}
@@
-500,14
+493,12
@@
do_parse_data__(int argc, char *argv[],
for (i = 2; i < argc; i++) {
struct ovsdb_datum datum;
for (i = 2; i < argc; i++) {
struct ovsdb_datum datum;
- size_t length;
json = unbox_json(parse_json(argv[i]));
check_ovsdb_error(parse(&datum, &type, json, NULL));
json_destroy(json);
json = unbox_json(parse_json(argv[i]));
check_ovsdb_error(parse(&datum, &type, json, NULL));
json_destroy(json);
- length = print_and_free_json(ovsdb_datum_to_json(&datum, &type));
- ovs_assert(length == ovsdb_datum_json_length(&datum, &type));
+ print_and_free_json(ovsdb_datum_to_json(&datum, &type));
ovsdb_datum_destroy(&datum, &type);
}
ovsdb_datum_destroy(&datum, &type);
}
@@
-831,7
+822,7
@@
do_evaluate_conditions(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
for (i = 0; i < n_conditions; i++) {
json_destroy(json);
for (i = 0; i < n_conditions; i++) {
- printf("condition %2
zu
:", i);
+ printf("condition %2
"PRIuSIZE"
:", i);
for (j = 0; j < n_rows; j++) {
bool result = ovsdb_condition_evaluate(rows[j], &conditions[i]);
if (j % 5 == 0) {
for (j = 0; j < n_rows; j++) {
bool result = ovsdb_condition_evaluate(rows[j], &conditions[i]);
if (j % 5 == 0) {
@@
-937,7
+928,7
@@
do_execute_mutations(int argc OVS_UNUSED, char *argv[])
json_destroy(json);
for (i = 0; i < n_sets; i++) {
json_destroy(json);
for (i = 0; i < n_sets; i++) {
- printf("mutation %2
zu
:\n", i);
+ printf("mutation %2
"PRIuSIZE"
:\n", i);
for (j = 0; j < n_rows; j++) {
struct ovsdb_error *error;
struct ovsdb_row *row;
for (j = 0; j < n_rows; j++) {
struct ovsdb_error *error;
struct ovsdb_row *row;
@@
-945,7
+936,7
@@
do_execute_mutations(int argc OVS_UNUSED, char *argv[])
row = ovsdb_row_clone(rows[j]);
error = ovsdb_mutation_set_execute(row, &sets[i]);
row = ovsdb_row_clone(rows[j]);
error = ovsdb_mutation_set_execute(row, &sets[i]);
- printf("row %
zu
: ", j);
+ printf("row %
"PRIuSIZE"
: ", j);
if (error) {
print_and_free_ovsdb_error(error);
} else {
if (error) {
print_and_free_ovsdb_error(error);
} else {
@@
-1069,7
+1060,7
@@
do_query(int argc OVS_UNUSED, char *argv[])
memset(cbdata.counts, 0, cbdata.n_rows * sizeof *cbdata.counts);
ovsdb_query(table, &cnd, do_query_cb, &cbdata);
memset(cbdata.counts, 0, cbdata.n_rows * sizeof *cbdata.counts);
ovsdb_query(table, &cnd, do_query_cb, &cbdata);
- printf("query %2
zu
:", i);
+ printf("query %2
"PRIuSIZE"
:", i);
for (j = 0; j < cbdata.n_rows; j++) {
if (j % 5 == 0) {
putchar(' ');
for (j = 0; j < cbdata.n_rows; j++) {
if (j % 5 == 0) {
putchar(' ');
@@
-1206,7
+1197,7
@@
do_query_distinct(int argc OVS_UNUSED, char *argv[])
}
ovsdb_row_set_destroy(&results);
}
ovsdb_row_set_destroy(&results);
- printf("query %2
zu
:", i);
+ printf("query %2
"PRIuSIZE"
:", i);
for (j = 0; j < n_rows; j++) {
int count = rows[j].class->count;
for (j = 0; j < n_rows; j++) {
int count = rows[j].class->count;
@@
-1680,7
+1671,7
@@
parse_uuids(const struct json *json, struct ovsdb_symbol_table *symtab,
struct uuid uuid;
if (json->type == JSON_STRING && uuid_from_string(&uuid, json->u.string)) {
struct uuid uuid;
if (json->type == JSON_STRING && uuid_from_string(&uuid, json->u.string)) {
- char *name = xasprintf("#%
zu
#", *n);
+ char *name = xasprintf("#%
"PRIuSIZE"
#", *n);
fprintf(stderr, "%s = "UUID_FMT"\n", name, UUID_ARGS(&uuid));
ovsdb_symbol_table_put(symtab, name, &uuid, false);
free(name);
fprintf(stderr, "%s = "UUID_FMT"\n", name, UUID_ARGS(&uuid));
ovsdb_symbol_table_put(symtab, name, &uuid, false);
free(name);
@@
-2001,3
+1992,9
@@
static struct command all_commands[] = {
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};
{ "help", 0, INT_MAX, do_help },
{ NULL, 0, 0, NULL },
};
+
+static struct command *
+get_all_commands(void)
+{
+ return all_commands;
+}