Fix some "declarations after code" problems

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(Imported from commit b0f9d3305850bdcce171b53e7bbbc9628a4e3c20)

diff --git a/lib/util/db_wrap.c b/lib/util/db_wrap.c
index 1b2bf7e22815a18130ffef9ce52cc5a4082c5239..bc174a42a8426afab69193b79b35a7953221515f 100644 (file)
--- a/lib/util/db_wrap.c
+++ b/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/server/ctdb_recover.c b/server/ctdb_recover.c
index 50bcf25a6a1d4388a0443586b4a7c6aa4a4685d4..16369caf544c8231373cb8900a0da8f2cb090656 100644 (file)
--- a/server/ctdb_recover.c
+++ b/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);