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

s3:dbwrap_watch: move 'wrec' from dbwrap_watched_do_locked_state to dbwrap_watched_do_locked_fn

Browse Source 
We can use a local variable in dbwrap_watched_do_locked_fn.
As 'wrec' should have the same lifetime as 'rec'.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-06-24 13:00:06 +00:00 committed by Ralph Boehme
parent 9356b1701c
commit 7226d0b365
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/dbwrap/dbwrap_watch.c
View File

@ -315,9 +315,6 @@ struct dbwrap_watched_do_locked_state {
TDB_DATA value,
void *private_data);
void *private_data;
struct db_watched_record wrec;
NTSTATUS status;
};
@ -379,17 +376,18 @@ static void dbwrap_watched_do_locked_fn(
{
struct dbwrap_watched_do_locked_state *state =
(struct dbwrap_watched_do_locked_state *)private_data;
struct db_watched_record wrec;
struct db_record rec = {
.db = state->db,
.key = dbwrap_record_get_key(subrec),
.value_valid = false,
.storev = dbwrap_watched_do_locked_storev,
.delete_rec = dbwrap_watched_do_locked_delete,
.private_data = &state->wrec,
.private_data = &wrec,
};
bool ok;
state->wrec = (struct db_watched_record) {
wrec = (struct db_watched_record) {
.subrec = subrec,
.wakeup_value = subrec_value,
};
@ -405,7 +403,7 @@ static void dbwrap_watched_do_locked_fn(
state->fn(&rec, rec.value, state->private_data);
db_watched_record_destructor(&state->wrec);
db_watched_record_destructor(&wrec);
}
static NTSTATUS dbwrap_watched_do_locked(struct db_context *db, TDB_DATA key,