diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-09-04 11:21:24 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-10 01:36:14 +0200 |
| commit | b0f9d3305850bdcce171b53e7bbbc9628a4e3c20 (patch) | |
| tree | 4ce4e85f076b4a3ca28fe48adcebce07285e4f54 | |
| parent | 1d16555fa0ad562dcd8c4bbffaca454e68bcabbf (diff) | |
| download | samba-b0f9d3305850bdcce171b53e7bbbc9628a4e3c20.tar.gz samba-b0f9d3305850bdcce171b53e7bbbc9628a4e3c20.tar.xz samba-b0f9d3305850bdcce171b53e7bbbc9628a4e3c20.zip | |
ctdb: Fix some "declarations after code" problems
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | ctdb/lib/util/db_wrap.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/lib/util/db_wrap.c b/ctdb/lib/util/db_wrap.c index 1b2bf7e228..bc174a42a8 100644 --- a/ctdb/lib/util/db_wrap.c +++ b/ctdb/lib/util/db_wrap.c @@ -47,8 +47,8 @@ static void log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const ch { if (level <= TDB_DEBUG_ERROR) { va_list ap; - this_log_level = level; char newfmt[strlen(tdb_name(tdb)) + 1 + strlen(fmt) + 1]; + this_log_level = level; sprintf(newfmt, "%s:%s", tdb_name(tdb), fmt); va_start(ap, fmt); do_debug_v(newfmt, ap); diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index d45b7f6c5b..d033b2126e 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -31,10 +31,11 @@ int ctdb_control_getvnnmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata) { - CHECK_CONTROL_DATA_SIZE(0); struct ctdb_vnn_map_wire *map; size_t len; + CHECK_CONTROL_DATA_SIZE(0); + len = offsetof(struct ctdb_vnn_map_wire, map) + sizeof(uint32_t)*ctdb->vnn_map->size; map = talloc_size(outdata, len); CTDB_NO_MEMORY(ctdb, map); |