projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix sparse warning on BUILD_BUG_ON_NOT_POWER_OF_2 definition.
[openvswitch]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index ad8cece2a17f4bee2b295d0c5ad7011146b715b4..f680989677617ff9d263137c42225f3d7a19c0a0 100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011
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
@@
-260,8
+264,7
@@
do_compact(int argc, char *argv[])
const char *db = argc >= 2 ? argv[1] : default_db();
const char *target = argc >= 3 ? argv[2] : NULL;
const char *db = argc >= 2 ? argv[1] : default_db();
const char *target = argc >= 3 ? argv[2] : NULL;
- compact_or_convert(db, target, NULL,
- "compacted by ovsdb-tool "VERSION BUILDNR);
+ compact_or_convert(db, target, NULL, "compacted by ovsdb-tool "VERSION);
}
static void
}
static void
@@
-274,7
+277,7
@@
do_convert(int argc, char *argv[])
check_ovsdb_error(ovsdb_schema_from_file(schema, &new_schema));
compact_or_convert(db, target, new_schema,
check_ovsdb_error(ovsdb_schema_from_file(schema, &new_schema));
compact_or_convert(db, target, new_schema,
- "converted by ovsdb-tool "VERSION
BUILDNR
);
+ "converted by ovsdb-tool "VERSION);
ovsdb_schema_destroy(new_schema);
}
ovsdb_schema_destroy(new_schema);
}