summaryrefslogtreecommitdiff
path: root/src/txn
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2014-10-21 16:25:34 +1100
committerMichael Cahill <michael.cahill@wiredtiger.com>2014-10-21 16:25:34 +1100
commite71b8ea82b7fd521445ff6534430948e2709844d (patch)
tree06983e993adda1e17b533e0979d63e72219f81ec /src/txn
parent5c67985c40bfea3d2d0b23c581ad8527a6a515c4 (diff)
downloadmongo-e71b8ea82b7fd521445ff6534430948e2709844d.tar.gz
Fix line wrapping.
Diffstat (limited to 'src/txn')
-rw-r--r--src/txn/txn_recover.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/txn/txn_recover.c b/src/txn/txn_recover.c
index 285dacbdc2c..38c606320ef 100644
--- a/src/txn/txn_recover.c
+++ b/src/txn/txn_recover.c
@@ -410,6 +410,7 @@ __wt_txn_recover(WT_CONNECTION_IMPL *conn)
WT_DECL_RET;
WT_RECOVERY r;
WT_SESSION_IMPL *session;
+ struct WT_RECOVERY_FILE *metafile;
const char *config;
int was_backup;
@@ -425,7 +426,8 @@ __wt_txn_recover(WT_CONNECTION_IMPL *conn)
WT_ERR(__wt_metadata_search(session, WT_METAFILE_URI, &config));
WT_ERR(__recovery_setup_file(&r, WT_METAFILE_URI, config));
WT_ERR(__wt_metadata_cursor(session, NULL, &metac));
- r.files[WT_METAFILE_ID].c = metac;
+ metafile = &r.files[WT_METAFILE_ID];
+ metafile->c = metac;
/*
* First, do a pass through the log to recover the metadata, and
@@ -434,12 +436,12 @@ __wt_txn_recover(WT_CONNECTION_IMPL *conn)
*/
if (!was_backup) {
r.metadata_only = 1;
- if (IS_INIT_LSN(&r.files[WT_METAFILE_ID].ckpt_lsn))
+ if (IS_INIT_LSN(&metafile->ckpt_lsn))
WT_ERR(__wt_log_scan(session,
NULL, WT_LOGSCAN_FIRST, __txn_log_recover, &r));
else
WT_ERR(__wt_log_scan(session,
- &r.files[WT_METAFILE_ID].ckpt_lsn, 0, __txn_log_recover, &r));
+ &metafile->ckpt_lsn, 0, __txn_log_recover, &r));
WT_ASSERT(session,
LOG_CMP(&r.ckpt_lsn, &conn->log->first_lsn) >= 0);