sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

tdb: Fix a "increases alignment" warning

Browse Source 
Many of those warnings are difficult to fix, but this one was easy :-)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Mar 22 07:21:44 CET 2018 on sn-devel-144
This commit is contained in:
Volker Lendecke 2018-03-04 11:51:13 +01:00 committed by Jeremy Allison
parent 2adbb1f751
commit 7964b3640a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tdb/common/transaction.c
View File

@ -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);