sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s3: Factor out parse_newest_in_marshall_buffer from pull_newest_from_marshall_buffer

Browse Source 
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Volker Lendecke 2012-11-12 12:13:39 +01:00 committed by Michael Adam
parent 850d5de967
commit 93219f92bb
1 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -432,11 +432,11 @@ static int db_ctdb_transaction_start(struct db_context *db)
return 0;
}
static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf,
TDB_DATA key,
struct ctdb_ltdb_header *pheader,
TALLOC_CTX *mem_ctx,
TDB_DATA *pdata)
static bool parse_newest_in_marshall_buffer(
struct ctdb_marshall_buffer *buf, TDB_DATA key,
void (*parser)(TDB_DATA key, struct ctdb_ltdb_header *header,
TDB_DATA data, void *private_data),
void *private_data)
{
struct ctdb_rec_data *rec = NULL;
struct ctdb_ltdb_header *h = NULL;
@ -477,19 +477,55 @@ static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf,
return false;
}
if (pdata != NULL) {
data.dptr = (uint8_t *)talloc_memdup(mem_ctx, data.dptr,
data.dsize);
if ((data.dsize != 0) && (data.dptr == NULL)) {
return false;
}
*pdata = data;
}
parser(key, h, data, private_data);
if (pheader != NULL) {
*pheader = *h;
}
return true;
}
struct pull_newest_from_marshall_buffer_state {
struct ctdb_ltdb_header *pheader;
TALLOC_CTX *mem_ctx;
TDB_DATA *pdata;
};
static void pull_newest_from_marshall_buffer_parser(
TDB_DATA key, struct ctdb_ltdb_header *header,
TDB_DATA data, void *private_data)
{
struct pull_newest_from_marshall_buffer_state *state =
(struct pull_newest_from_marshall_buffer_state *)private_data;
if (state->pheader != NULL) {
memcpy(state->pheader, header, sizeof(*state->pheader));
}
if (state->pdata != NULL) {
state->pdata->dsize = data.dsize;
state->pdata->dptr = (uint8_t *)talloc_memdup(
state->mem_ctx, data.dptr, data.dsize);
}
}
static bool pull_newest_from_marshall_buffer(struct ctdb_marshall_buffer *buf,
TDB_DATA key,
struct ctdb_ltdb_header *pheader,
TALLOC_CTX *mem_ctx,
TDB_DATA *pdata)
{
struct pull_newest_from_marshall_buffer_state state;
state.pheader = pheader;
state.mem_ctx = mem_ctx;
state.pdata = pdata;
if (!parse_newest_in_marshall_buffer(
buf, key, pull_newest_from_marshall_buffer_parser,
&state)) {
return false;
}
if ((pdata != NULL) && (pdata->dsize != 0) && (pdata->dptr == NULL)) {
/* ENOMEM */
return false;
}
return true;
}