ctdb-client: Use ctdb_ltdb_header_extract()
authorAmitay Isaacs <amitay@gmail.com>
Tue, 10 Nov 2015 07:32:05 +0000 (18:32 +1100)
committerMartin Schwenke <martins@samba.org>
Wed, 20 Jan 2016 03:19:11 +0000 (04:19 +0100)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/client/client_db.c

index 6af607af09b696acba62bfd84cc132b5e673048d..f9368b265f4e84a5d0a6716e6633b794a6098c17 100644 (file)
@@ -591,19 +591,13 @@ static int ctdb_db_traverse_handler(struct tdb_context *tdb, TDB_DATA key,
 
        if (state->extract_header) {
                struct ctdb_ltdb_header header;
-               size_t len;
 
-               ret = ctdb_ltdb_header_pull(data.dptr, data.dsize, &header);
+               ret = ctdb_ltdb_header_extract(&data, &header);
                if (ret != 0) {
                        state->error = ret;
                        return 1;
                }
 
-               len = ctdb_ltdb_header_len(&header);
-
-               data.dptr += len;
-               data.dsize -= len;
-
                ret = state->parser(0, &header, key, data, state->private_data);
        } else {
                ret = state->parser(0, NULL, key, data, state->private_data);