projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nx-match: Improve log message in nx_entry_ok().
[openvswitch]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index ecf998b38ff392a15e46ca9020247b24a62c5c42..f5412f36b7b5295881ebdc117895559b84bf1b4f 100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira
Networks
.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-252,6
+252,10
@@
compact_or_convert(const char *src_name, const char *dst_name,
}
lockfile_unlock(dst_lock);
}
lockfile_unlock(dst_lock);
+
+ if (in_place) {
+ free((char *) dst_name);
+ }
}
static void
}
static void
@@
-509,7
+513,7
@@
do_show_log(int argc, char *argv[])
time_t t = json_integer(date);
char s[128];
time_t t = json_integer(date);
char s[128];
- strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S",
local
time(&t));
+ strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S",
gm
time(&t));
printf(" %s", s);
}
printf(" %s", s);
}