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

s3:gencache: simply stabilize() a bit more: remove error from state

Browse Source 
state.error is set to true if and only if the traverse
callback returns error (-1), and hence only if the traverse
fails.

Hence the the error state is redundant.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
This commit is contained in:
Michael Adam 2014-06-26 16:56:41 +02:00 committed by Volker Lendecke
parent 202ee81e86
commit d240cf7894
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/lib/gencache.c
View File

@ -614,7 +614,6 @@ fail:
struct stabilize_state { struct stabilize_state {
bool written; bool written;
bool error;
}; };
static int stabilize_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA val, static int stabilize_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA val,
void *priv); void *priv);
@ -660,11 +659,10 @@ bool gencache_stabilize(void)
return false; return false;
} }
state.error = false;
state.written = false; state.written = false;
res = tdb_traverse(cache_notrans, stabilize_fn, &state); res = tdb_traverse(cache_notrans, stabilize_fn, &state);
if ((res < 0) || state.error) { if (res < 0) {
tdb_transaction_cancel(cache_notrans); tdb_transaction_cancel(cache_notrans);
tdb_transaction_cancel(cache); tdb_transaction_cancel(cache);
return false; return false;
@ -733,14 +731,12 @@ static int stabilize_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA val,
if (res != 0) { if (res != 0) {
DEBUG(10, ("Transfer to gencache.tdb failed: %s\n", DEBUG(10, ("Transfer to gencache.tdb failed: %s\n",
tdb_errorstr_compat(cache))); tdb_errorstr_compat(cache)));
state->error = true;
return -1; return -1;
} }
if (tdb_delete(cache_notrans, key) != 0) { if (tdb_delete(cache_notrans, key) != 0) {
DEBUG(10, ("tdb_delete from gencache_notrans.tdb failed: " DEBUG(10, ("tdb_delete from gencache_notrans.tdb failed: "
"%s\n", tdb_errorstr_compat(cache_notrans))); "%s\n", tdb_errorstr_compat(cache_notrans)));
state->error = true;
return -1; return -1;
} }
return 0; return 0;