diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-26 15:18:52 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-26 10:22:03 +0200 |
| commit | 66f59f040984bef5023fc844097b85bebee88f09 (patch) | |
| tree | 9d642302f19c7be7149b6c9e4a8ffbd8a99f9376 /lib/tdb/test/run-die-during-transaction.c | |
| parent | d1aeb2d1c3bfb87e9ab4079535867b40fb722fde (diff) | |
| download | samba-66f59f040984bef5023fc844097b85bebee88f09.tar.gz samba-66f59f040984bef5023fc844097b85bebee88f09.tar.bz2 samba-66f59f040984bef5023fc844097b85bebee88f09.zip | |
tdb: finish weaning off err.h.
Commit 3c4263e7580143c69225729f5b67f09c00add2fd said it removed err.h
from tdb, unfortuntely it didn't: tap-interface.h still included it.
This finishes it properly!
Reported-by:Stefan Metzmacher <metze@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User(master): Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date(master): Tue Jun 26 10:22:03 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib/tdb/test/run-die-during-transaction.c')
| -rw-r--r-- | lib/tdb/test/run-die-during-transaction.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/tdb/test/run-die-during-transaction.c b/lib/tdb/test/run-die-during-transaction.c index 19c9dbebf9..6e3a70d4ae 100644 --- a/lib/tdb/test/run-die-during-transaction.c +++ b/lib/tdb/test/run-die-during-transaction.c @@ -164,12 +164,18 @@ reset: key.dsize--; ret = external_agent_operation(agent, OPEN, TEST_DBNAME); - if (ret != SUCCESS) - errx(1, "Agent failed to open: %s", agent_return_name(ret)); + if (ret != SUCCESS) { + fprintf(stderr, "Agent failed to open: %s\n", + agent_return_name(ret)); + exit(1); + } ret = external_agent_operation(agent, FETCH, KEY_STRING); - if (ret != SUCCESS) - errx(1, "Agent failed find key: %s", agent_return_name(ret)); + if (ret != SUCCESS) { + fprintf(stderr, "Agent failed find key: %s\n", + agent_return_name(ret)); + exit(1); + } in_transaction = true; if (tdb_transaction_start(tdb) != 0) @@ -215,8 +221,6 @@ int main(int argc, char *argv[]) unlock_callback = maybe_die; agent = prepare_external_agent(); - if (!agent) - err(1, "preparing agent"); for (i = 0; i < sizeof(ops)/sizeof(ops[0]); i++) { diag("Testing %s after death", operation_name(ops[i])); |