From 33e2ceb56658e7a9fead494f456af6c916cab73c Mon Sep 17 00:00:00 2001
From: Keith Bostic <keith@wiredtiger.com>
Date: Fri, 8 Apr 2016 17:38:52 -0400
Subject: WT-2535: Add an explicit test for lost updates

Switch from "int ret" to WT_DECL_RET everywhere.
---
 test/format/backup.c  |  2 +-
 test/format/compact.c |  2 +-
 test/format/ops.c     | 14 +++++++-------
 test/format/salvage.c |  4 ++--
 test/format/t.c       |  2 +-
 test/format/wts.c     |  6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/format/backup.c b/test/format/backup.c
index 2b1463bd0e3..0ce40d0e631 100644
--- a/test/format/backup.c
+++ b/test/format/backup.c
@@ -85,9 +85,9 @@ backup(void *arg)
 {
 	WT_CONNECTION *conn;
 	WT_CURSOR *backup_cursor;
+	WT_DECL_RET;
 	WT_SESSION *session;
 	u_int period;
-	int ret;
 	const char *key;
 
 	(void)(arg);
diff --git a/test/format/compact.c b/test/format/compact.c
index a75ee4f2adf..240e5553697 100644
--- a/test/format/compact.c
+++ b/test/format/compact.c
@@ -36,9 +36,9 @@ void *
 compact(void *arg)
 {
 	WT_CONNECTION *conn;
+	WT_DECL_RET;
 	WT_SESSION *session;
 	u_int period;
-	int ret;
 
 	(void)(arg);
 
diff --git a/test/format/ops.c b/test/format/ops.c
index 54330c6ecd6..6e7ca12ebd8 100644
--- a/test/format/ops.c
+++ b/test/format/ops.c
@@ -701,9 +701,9 @@ read_row(WT_CURSOR *cursor, WT_ITEM *key, uint64_t keyno, int notfound_err)
 static int
 nextprev(WT_CURSOR *cursor, int next, int *notfoundp)
 {
+	WT_DECL_RET;
 	WT_ITEM key, value;
 	uint64_t keyno;
-	int ret;
 	uint8_t bitfield;
 	const char *which;
 
@@ -814,8 +814,8 @@ static int
 row_update(TINFO *tinfo,
     WT_CURSOR *cursor, WT_ITEM *key, WT_ITEM *value, uint64_t keyno)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	session = cursor->session;
 
@@ -860,8 +860,8 @@ static int
 col_update(TINFO *tinfo,
     WT_CURSOR *cursor, WT_ITEM *key, WT_ITEM *value, uint64_t keyno)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	session = cursor->session;
 
@@ -1017,8 +1017,8 @@ static int
 row_insert(TINFO *tinfo,
     WT_CURSOR *cursor, WT_ITEM *key, WT_ITEM *value, uint64_t keyno)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	session = cursor->session;
 
@@ -1063,9 +1063,9 @@ static int
 col_insert(TINFO *tinfo,
     WT_CURSOR *cursor, WT_ITEM *key, WT_ITEM *value, uint64_t *keynop)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
 	uint64_t keyno;
-	int ret;
 
 	session = cursor->session;
 
@@ -1121,8 +1121,8 @@ col_insert(TINFO *tinfo,
 static int
 row_remove(WT_CURSOR *cursor, WT_ITEM *key, uint64_t keyno, int *notfoundp)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	session = cursor->session;
 
@@ -1167,8 +1167,8 @@ row_remove(WT_CURSOR *cursor, WT_ITEM *key, uint64_t keyno, int *notfoundp)
 static int
 col_remove(WT_CURSOR *cursor, WT_ITEM *key, uint64_t keyno, int *notfoundp)
 {
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	session = cursor->session;
 
diff --git a/test/format/salvage.c b/test/format/salvage.c
index 526e1563390..b2a38e37c8b 100644
--- a/test/format/salvage.c
+++ b/test/format/salvage.c
@@ -36,8 +36,8 @@ static void
 salvage(void)
 {
 	WT_CONNECTION *conn;
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	conn = g.wts_conn;
 	track("salvage", 0ULL, NULL);
@@ -141,7 +141,7 @@ found:	if (fstat(fd, &sb) == -1)
 void
 wts_salvage(void)
 {
-	int ret;
+	WT_DECL_RET;
 
 	/* Some data-sources don't support salvage. */
 	if (DATASOURCE("helium") || DATASOURCE("kvsbdb"))
diff --git a/test/format/t.c b/test/format/t.c
index 28c22e23cb8..f991e49a9b0 100644
--- a/test/format/t.c
+++ b/test/format/t.c
@@ -288,7 +288,7 @@ main(int argc, char *argv[])
 static void
 startup(void)
 {
-	int ret;
+	WT_DECL_RET;
 
 	/* Flush/close any logging information. */
 	fclose_and_clear(&g.logfp);
diff --git a/test/format/wts.c b/test/format/wts.c
index 81e484296e2..267c03e4868 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -129,7 +129,7 @@ void
 wts_open(const char *home, int set_api, WT_CONNECTION **connp)
 {
 	WT_CONNECTION *conn;
-	int ret;
+	WT_DECL_RET;
 	char *config, *end, *p, helium_config[1024];
 
 	*connp = NULL;
@@ -497,8 +497,8 @@ void
 wts_verify(const char *tag)
 {
 	WT_CONNECTION *conn;
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ret;
 
 	if (g.c_verify == 0)
 		return;
@@ -531,12 +531,12 @@ wts_stats(void)
 {
 	WT_CONNECTION *conn;
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	WT_SESSION *session;
 	FILE *fp;
 	char *stat_name;
 	const char *pval, *desc;
 	uint64_t v;
-	int ret;
 
 	/* Ignore statistics if they're not configured. */
 	if (g.c_statistics == 0)
-- 
cgit v1.2.1