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 'master' of git://openvswitch.org/openvswitch
[sliver-openvswitch.git]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index
f31bdd1
..
b50b39b
100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012
, 2013
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.
@@
-229,14
+229,14
@@
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,
0,
&src_lock);
+ retval = lockfile_lock(src_name, &src_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
}
/* Get (temporary) destination and lock it. */
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
}
/* Get (temporary) destination and lock it. */
- retval = lockfile_lock(dst_name,
0,
&dst_lock);
+ retval = lockfile_lock(dst_name, &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);
}
@@
-435,8
+435,8
@@
print_db_changes(struct shash *tables, struct shash *names,
? shash_find_data(&table_schema->columns, column)
: NULL);
if (column_schema) {
? shash_find_data(&table_schema->columns, column)
: NULL);
if (column_schema) {
- const struct ovsdb_error *error;
const struct ovsdb_type *type;
const struct ovsdb_type *type;
+ struct ovsdb_error *error;
struct ovsdb_datum datum;
type = &column_schema->type;
struct ovsdb_datum datum;
type = &column_schema->type;
@@
-448,6
+448,8
@@
print_db_changes(struct shash *tables, struct shash *names,
ds_init(&s);
ovsdb_datum_to_string(&datum, type, &s);
value_string = ds_steal_cstr(&s);
ds_init(&s);
ovsdb_datum_to_string(&datum, type, &s);
value_string = ds_steal_cstr(&s);
+ } else {
+ ovsdb_error_destroy(error);
}
}
if (!value_string) {
}
}
if (!value_string) {