diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-05-29 07:52:29 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-05-29 07:52:29 -0400 |
| commit | 316bec7f76b1b1313e4ec21751b99a4d77ca7408 (patch) | |
| tree | 8d7a3b98049cefa5fe146989c020e92c681f3fea | |
| parent | 322de756280b272e2c815887f2531d29bc460b87 (diff) | |
| download | mongo-316bec7f76b1b1313e4ec21751b99a4d77ca7408.tar.gz | |
Minor KNF, whitespace.
| -rw-r--r-- | src/txn/txn_ckpt.c | 8 | ||||
| -rw-r--r-- | src/txn/txn_log.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c index 8ce0a7ea557..0bc817858b1 100644 --- a/src/txn/txn_ckpt.c +++ b/src/txn/txn_ckpt.c @@ -349,16 +349,16 @@ __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]) WT_TXN *txn; WT_TXN_GLOBAL *txn_global; WT_TXN_ISOLATION saved_isolation; - const char *txn_cfg[] = { WT_CONFIG_BASE(session, - WT_SESSION_begin_transaction), "isolation=snapshot", NULL }; void *saved_meta_next; - int full, idle, logging, tracking; u_int i; + int full, idle, logging, tracking; + const char *txn_cfg[] = { WT_CONFIG_BASE(session, + WT_SESSION_begin_transaction), "isolation=snapshot", NULL }; conn = S2C(session); - txn_global = &conn->txn_global; saved_isolation = session->isolation; txn = &session->txn; + txn_global = &conn->txn_global; logging = FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED); full = idle = tracking = 0; diff --git a/src/txn/txn_log.c b/src/txn/txn_log.c index 19953e609af..0d66eccd7dc 100644 --- a/src/txn/txn_log.c +++ b/src/txn/txn_log.c @@ -301,8 +301,8 @@ __wt_txn_checkpoint_log( if (lsnp != NULL) *lsnp = *ckpt_lsn; return (0); - } else - return (__txn_log_file_sync(session, flags, lsnp)); + } + return (__txn_log_file_sync(session, flags, lsnp)); } switch (flags) { @@ -316,7 +316,6 @@ __wt_txn_checkpoint_log( */ WT_ERR(__wt_log_force_sync(session, ckpt_lsn)); break; - case WT_TXN_LOG_CKPT_START: /* Take a copy of the transaction snapshot. */ txn->ckpt_nsnapshot = txn->snapshot_count; @@ -328,7 +327,6 @@ __wt_txn_checkpoint_log( WT_ERR(__wt_vpack_uint( &p, WT_PTRDIFF(end, p), txn->snapshot[i])); break; - case WT_TXN_LOG_CKPT_STOP: /* * During a clean connection close, we get here without the @@ -374,7 +372,6 @@ __wt_txn_checkpoint_log( __wt_scr_free(session, &txn->ckpt_snapshot); txn->full_ckpt = 0; break; - WT_ILLEGAL_VALUE_ERR(session); } |