Merge pull request #803 from wiredtiger/lint

Coverity + lint

2 files changed, 9 insertions, 4 deletions

diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index f817f0eff1d..47be4dd907c 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -823,10 +823,16 @@ execute_populate(CONFIG *cfg)
 			return (ret);
 		}
 		lprintf(cfg, 0, 1, "Compact after populate");
-		ret = session->compact(session, cfg->uri, NULL);
-		session->close(session, NULL);
-		if (ret != 0)
+		if ((ret = session->compact(session, cfg->uri, NULL)) != 0) {
+			lprintf(cfg, ret, 0,
+			     "execute_populate: WT_SESSION.compact");
+			return (ret);
+		}
+		if ((ret = session->close(session, NULL)) != 0) {
+			lprintf(cfg, ret, 0,
+			     "execute_populate: WT_SESSION.close");
 			return (ret);
+		}
 	}
 
 	/*
diff --git a/src/session/session_compact.c b/src/session/session_compact.c
index 2ebddd653d5..7a7121adc19 100644
--- a/src/session/session_compact.c
+++ b/src/session/session_compact.c
@@ -234,5 +234,4 @@ __wt_session_compact(
 
 err:	session->compact = NULL;
 	API_END_NOTFOUND_MAP(session, ret);
-	return (ret);
 }