diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 18:40:31 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 11:18:35 +0200 |
| commit | d6251996fa5b8371c0f7449825b5d1788da95dd0 (patch) | |
| tree | d2295fb5edffef971841c3220a6c1ce17af81808 /source3/lib/util_tdb.c | |
| parent | 2b1452b2fc0573e09fedb7fbd8a5f8d278470b9c (diff) | |
| download | samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.tar.gz samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.tar.bz2 samba-d6251996fa5b8371c0f7449825b5d1788da95dd0.zip | |
tdb_transaction_cancel: ignore return value.
TDB2 returns void here. tdb_transaction_cancel will *always* return
with the transaction cancelled, but it will complain via the log
function if a transaction wasn't in progress.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/lib/util_tdb.c')
| -rw-r--r-- | source3/lib/util_tdb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 5c3dc3a07d..f0fc8cd29b 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -442,9 +442,7 @@ int tdb_trans_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, if ((res = tdb_store(tdb, key, dbuf, flag)) != 0) { DEBUG(10, ("tdb_store failed\n")); - if (tdb_transaction_cancel(tdb) != 0) { - smb_panic("Cancelling transaction failed"); - } + tdb_transaction_cancel(tdb); return res; } @@ -471,9 +469,7 @@ int tdb_trans_delete(struct tdb_context *tdb, TDB_DATA key) if ((res = tdb_delete(tdb, key)) != 0) { DEBUG(10, ("tdb_delete failed\n")); - if (tdb_transaction_cancel(tdb) != 0) { - smb_panic("Cancelling transaction failed"); - } + tdb_transaction_cancel(tdb); return res; } |