summaryrefslogtreecommitdiff
path: root/src/async
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2015-04-09 11:52:13 -0400
committerKeith Bostic <keith@wiredtiger.com>2015-04-09 11:52:13 -0400
commit21907f9193e30f51a59fcbaddfbc46cb7732d3b7 (patch)
tree259de692b0d6ea9dbed60cc4b89188094aef25b8 /src/async
parenta29f4d2f40eee784950147af848fdbf277328b7f (diff)
downloadmongo-21907f9193e30f51a59fcbaddfbc46cb7732d3b7.tar.gz
Remove unnecessary error labels, fixing SERVER-17948 along the way.
Coverity analysis defect 72088: Redundant test: File: /src/third_party/wiredtiger/src/log/log.c Function __log_decompress /src/third_party/wiredtiger/src/log/log.c, line: 363 At condition "ret != 0", the value of "ret" must be equal to 0.
Diffstat (limited to 'src/async')
-rw-r--r--src/async/async_worker.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/async/async_worker.c b/src/async/async_worker.c
index 543046f7a0c..f956c11b05c 100644
--- a/src/async/async_worker.c
+++ b/src/async/async_worker.c
@@ -105,12 +105,10 @@ retry:
static int
__async_flush_wait(WT_SESSION_IMPL *session, WT_ASYNC *async, uint64_t my_gen)
{
- WT_DECL_RET;
-
while (async->flush_state == WT_ASYNC_FLUSHING &&
async->flush_gen == my_gen)
- WT_ERR(__wt_cond_wait(session, async->flush_cond, 10000));
-err: return (ret);
+ WT_RET(__wt_cond_wait(session, async->flush_cond, 10000));
+ return (0);
}
/*