projects / packages / inn.git / blame
| Commit | Line | Data |
|---|---|---|
| 06966e39 MM |
1 | --- storage/ovdb/ovdb-private.h.orig 2003-05-09 04:25:27.000000000 +0000 |
| 2 | +++ storage/ovdb/ovdb-private.h 2003-12-04 18:03:59.000000000 +0000 | |
| 3 | @@ -173,7 +173,7 @@ | |
| 4 | #define TXN_START(label, tid) \ | |
| 5 | label: { \ | |
| 6 | int txn_ret; \ | |
| 7 | - txn_ret = txn_begin(OVDBenv->tx_info, NULL, &tid); \ | |
| 8 | + txn_ret = OVDBenv->tx_info->txn_begin(OVDBenv->tx_info, NULL, &tid); \ | |
| 9 | if (txn_ret != 0) { \ | |
| 10 | syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \ | |
| 11 | tid = NULL; \ | |
| 12 | @@ -181,10 +181,10 @@ | |
| 13 | } | |
| 14 | ||
| 15 | #define TXN_RETRY(label, tid) \ | |
| 16 | -{ txn_abort(tid); goto label; } | |
| 17 | +{ tid->abort(tid); goto label; } | |
| 18 | ||
| 19 | -#define TXN_ABORT(label, tid) txn_abort(tid) | |
| 20 | -#define TXN_COMMIT(label, tid) txn_commit(tid) | |
| 21 | +#define TXN_ABORT(label, tid) tid->abort(tid) | |
| 22 | +#define TXN_COMMIT(label, tid) tid->commit(tid) | |
| 23 | ||
| 24 | #define TRYAGAIN EAGAIN | |
| 25 | ||
| 26 | @@ -194,7 +194,7 @@ | |
| 27 | #define TXN_START(label, tid) \ | |
| 28 | label: { \ | |
| 29 | int txn_ret; \ | |
| 30 | - txn_ret = txn_begin(OVDBenv, NULL, &tid, 0); \ | |
| 31 | + txn_ret = OVDBenv->txn_begin(OVDBenv, NULL, &tid, 0); \ | |
| 32 | if (txn_ret != 0) { \ | |
| 33 | syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \ | |
| 34 | tid = NULL; \ | |
| 35 | @@ -202,10 +202,10 @@ | |
| 36 | } | |
| 37 | ||
| 38 | #define TXN_RETRY(label, tid) \ | |
| 39 | -{ txn_abort(tid); goto label; } | |
| 40 | +{ tid->abort(tid); goto label; } | |
| 41 | ||
| 42 | -#define TXN_ABORT(label, tid) txn_abort(tid) | |
| 43 | -#define TXN_COMMIT(label, tid) txn_commit(tid, 0) | |
| 44 | +#define TXN_ABORT(label, tid) tid->abort(tid) | |
| 45 | +#define TXN_COMMIT(label, tid) tid->commit(tid, 0) | |
| 46 | ||
| 47 | #define TRYAGAIN DB_LOCK_DEADLOCK | |
| 48 |