From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 10 Nov 2015 07:32:05 +0000 (+1100)
Subject: ctdb-client: Use ctdb_ltdb_header_extract()
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=e59712b2c311c4d5fff82bc62f86a83ea4e86cbd

ctdb-client: Use ctdb_ltdb_header_extract()

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 6af607af09b..f9368b265f4 100644
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -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);