projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Use get_32aligned_u64() in an appropriate place.
[openvswitch]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index 07d27293cfbf62b475de658be9eaac52f35c61d7..0e4a5207920d18ea60f0c4aed608da085d0032b3 100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-85,7
+85,7
@@
parse_options(int argc, char *argv[])
usage();
case 'V':
usage();
case 'V':
-
OVS_PRINT_VERSION
(0, 0);
+
ovs_print_version
(0, 0);
exit(EXIT_SUCCESS);
case 'v':
exit(EXIT_SUCCESS);
case 'v':
@@
-228,7
+228,8
@@
compact_or_convert(const char *src_name, const char *dst_name,
static void
do_compact(int argc OVS_UNUSED, char *argv[])
{
static void
do_compact(int argc OVS_UNUSED, char *argv[])
{
- compact_or_convert(argv[1], argv[2], NULL, "compacted by ovsdb-tool");
+ compact_or_convert(argv[1], argv[2], NULL,
+ "compacted by ovsdb-tool "VERSION BUILDNR);
}
static void
}
static void
@@
-239,7
+240,7
@@
do_convert(int argc OVS_UNUSED, char *argv[])
check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &new_schema));
compact_or_convert(argv[1], argv[3], new_schema,
check_ovsdb_error(ovsdb_schema_from_file(schema_file_name, &new_schema));
compact_or_convert(argv[1], argv[3], new_schema,
- "converted by ovsdb-tool
"
);
+ "converted by ovsdb-tool
"VERSION BUILDNR
);
ovsdb_schema_destroy(new_schema);
}
ovsdb_schema_destroy(new_schema);
}
@@
-310,7
+311,7
@@
transact(bool read_only, const char *db_file_name, const char *transaction)
check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL));
request = parse_json(transaction);
check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL));
request = parse_json(transaction);
- result = ovsdb_execute(db, request, 0, NULL);
+ result = ovsdb_execute(db,
NULL,
request, 0, NULL);
json_destroy(request);
print_and_free_json(result);
json_destroy(request);
print_and_free_json(result);