From 7964b3640aacaab68f002c290d82f86e7c709268 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 4 Mar 2018 11:51:13 +0100 Subject: tdb: Fix a "increases alignment" warning Many of those warnings are difficult to fix, but this one was easy :-) Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Mar 22 07:21:44 CET 2018 on sn-devel-144 --- lib/tdb/common/transaction.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/tdb/common') diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index 390e51dfa2a..73d02b684a3 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -854,13 +854,12 @@ static int transaction_setup_recovery(struct tdb_context *tdb, return -1; } - data = (unsigned char *)malloc(recovery_size + sizeof(*rec)); - if (data == NULL) { + rec = malloc(recovery_size + sizeof(*rec)); + if (rec == NULL) { tdb->ecode = TDB_ERR_OOM; return -1; } - rec = (struct tdb_record *)data; memset(rec, 0, sizeof(*rec)); rec->magic = TDB_RECOVERY_INVALID_MAGIC; @@ -869,6 +868,8 @@ static int transaction_setup_recovery(struct tdb_context *tdb, rec->key_len = old_map_size; CONVERT(*rec); + data = (unsigned char *)rec; + /* build the recovery data into a single blob to allow us to do a single large write, which should be more efficient */ p = data + sizeof(*rec); -- cgit v1.2.1