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

r10460: fixed portability of transaction code to systems with integer

Browse Source 
alignment constraints (like sparc)
(This used to be commit bce35ad237)
This commit is contained in:
Andrew Tridgell 2005-09-24 02:37:22 +00:00 committed by Gerald (Jerry) Carter
parent 036b27c8e4
commit c0e6586405
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/lib/tdb/common/transaction.c
View File

@ -628,7 +628,7 @@ static int transaction_setup_recovery(struct tdb_context *tdb,
struct list_struct *rec;
tdb_off_t recovery_offset, recovery_max_size;
tdb_off_t old_map_size = tdb->transaction->old_map_size;
u32 magic;
u32 magic, tailer;
/*
check that the recovery area has enough space
@ -666,8 +666,8 @@ static int transaction_setup_recovery(struct tdb_context *tdb,
tdb->ecode = TDB_ERR_CORRUPT;
return -1;
}
((u32 *)p)[0] = el->offset;
((u32 *)p)[1] = el->length;
memcpy(p, &el->offset, 4);
memcpy(p+4, &el->length, 4);
if (DOCONV()) {
tdb_convert(p, 8);
}
@ -683,7 +683,8 @@ static int transaction_setup_recovery(struct tdb_context *tdb,
}
/* and the tailer */
*(u32 *)p = sizeof(*rec) + recovery_max_size;
tailer = sizeof(*rec) + recovery_max_size;
memcpy(p, &tailer, 4);
CONVERT(p);
/* write the recovery data to the recovery area */
@ -926,8 +927,8 @@ int tdb_transaction_recover(struct tdb_context *tdb)
if (DOCONV()) {
tdb_convert(p, 8);
}
ofs = ((u32 *)p)[0];
len = ((u32 *)p)[1];
memcpy(&ofs, p, 4);
memcpy(&len, p+4, 4);
if (tdb->methods->tdb_write(tdb, ofs, p+8, len) == -1) {
free(data);