diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-26 16:27:57 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-26 16:27:57 +1100 |
| commit | 4a21dd1c13e5bbe924b62f4a9f129caefb3ee146 (patch) | |
| tree | bbf6219a9acf3b552013841df4ca219979e4e2f8 /src | |
| parent | 1ef00c1a07a71f1db6f3732325bd0ada669baa85 (diff) | |
| download | mongo-4a21dd1c13e5bbe924b62f4a9f129caefb3ee146.tar.gz | |
txn/txn_log.c:224: warning: declaration of 'sync' shadows a global declaration
Diffstat (limited to 'src')
| -rw-r--r-- | src/txn/txn_log.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/txn/txn_log.c b/src/txn/txn_log.c index bf0b1990557..d3e010cf401 100644 --- a/src/txn/txn_log.c +++ b/src/txn/txn_log.c @@ -221,12 +221,12 @@ __txn_log_file_sync(WT_SESSION_IMPL *session, uint32_t flags, WT_LSN *lsnp) WT_DECL_RET; size_t header_size; uint32_t rectype = WT_LOGREC_FILE_SYNC; - int start, sync; + int start, need_sync; const char *fmt = WT_UNCHECKED_STRING(III); btree = S2BT(session); start = LF_ISSET(WT_TXN_LOG_CKPT_START); - sync = LF_ISSET(WT_TXN_LOG_CKPT_SYNC); + need_sync = LF_ISSET(WT_TXN_LOG_CKPT_SYNC); WT_RET(__wt_struct_size( session, &header_size, fmt, rectype, btree->id, start)); @@ -237,7 +237,8 @@ __txn_log_file_sync(WT_SESSION_IMPL *session, uint32_t flags, WT_LSN *lsnp) fmt, rectype, btree->id, start)); logrec->size += (uint32_t)header_size; - WT_ERR(__wt_log_write(session, logrec, lsnp, sync ? WT_LOG_FSYNC : 0)); + WT_ERR(__wt_log_write( + session, logrec, lsnp, need_sync ? WT_LOG_FSYNC : 0)); err: __wt_logrec_free(session, &logrec); return (ret); } |