projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Don't track IP TOS value two different ways.
[openvswitch]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index 1c9e9206a154afb130e976c0fa6e10c71b7d4d60..0da2085904c5a4afc189af6ff2944f04795062dc 100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-34,9
+34,9
@@
#include "table.h"
#include "timeval.h"
#include "util.h"
#include "table.h"
#include "timeval.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_ovsdb_tool
+
+VLOG_DEFINE_THIS_MODULE(ovsdb_tool)
/* -m, --more: Verbosity level for "show-log" command output. */
static int show_log_verbosity;
/* -m, --more: Verbosity level for "show-log" command output. */
static int show_log_verbosity;
@@
-50,8
+50,6
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
@@
-189,7
+187,7
@@
compact_or_convert(const char *src_name, const char *dst_name,
/* Lock the source, if we will be replacing it. */
if (in_place) {
/* Lock the source, if we will be replacing it. */
if (in_place) {
- retval = lockfile_lock(src_name,
INT_MAX
, &src_lock);
+ retval = lockfile_lock(src_name,
0
, &src_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
@@
-199,7
+197,7
@@
compact_or_convert(const char *src_name, const char *dst_name,
if (in_place) {
dst_name = xasprintf("%s.tmp", src_name);
}
if (in_place) {
dst_name = xasprintf("%s.tmp", src_name);
}
- retval = lockfile_lock(dst_name,
INT_MAX
, &dst_lock);
+ retval = lockfile_lock(dst_name,
0
, &dst_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
}
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
}