Replace local "ret" declarations with WT_DECL_RET.

15 files changed, 45 insertions, 38 deletions

diff --git a/src/utilities/util_create.c b/src/utilities/util_create.c
index 106a49d3537..750777a7c3a 100644
--- a/src/utilities/util_create.c
+++ b/src/utilities/util_create.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_create(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	const char *config, *uri;
 
 	config = NULL;
diff --git a/src/utilities/util_dump.c b/src/utilities/util_dump.c
index 3f68b9e7cfe..f3c1239a00e 100644
--- a/src/utilities/util_dump.c
+++ b/src/utilities/util_dump.c
@@ -18,8 +18,8 @@ static int usage(void);
 static inline int
 dump_forward(WT_CURSOR *cursor, const char *name)
 {
+	WT_DECL_RET;
 	const char *key, *value;
-	int ret;
 
 	while ((ret = cursor->next(cursor)) == 0) {
 		if ((ret = cursor->get_key(cursor, &key)) != 0)
@@ -35,8 +35,8 @@ dump_forward(WT_CURSOR *cursor, const char *name)
 static inline int
 dump_reverse(WT_CURSOR *cursor, const char *name)
 {
+	WT_DECL_RET;
 	const char *key, *value;
-	int ret;
 
 	while ((ret = cursor->prev(cursor)) == 0) {
 		if ((ret = cursor->get_key(cursor, &key)) != 0)
@@ -53,8 +53,9 @@ int
 util_dump(WT_SESSION *session, int argc, char *argv[])
 {
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	size_t len;
-	int ch, hex, ret, reverse;
+	int ch, hex, reverse;
 	char *config, *name, *snapshot;
 
 	hex = reverse = 0;
@@ -138,9 +139,8 @@ static int
 schema(WT_SESSION *session, const char *uri)
 {
 	WT_CURSOR *cursor;
-	int ret, tret;
-
-	ret = 0;
+	WT_DECL_RET;
+	int tret;
 
 	/* Open the schema file. */
 	if ((ret = session->open_cursor(
@@ -173,12 +173,11 @@ schema_table(WT_SESSION *session, WT_CURSOR *cursor, const char *uri)
 		char *key;			/* Schema key */
 		char *value;			/* Schema value */
 	} *list;
-	int i, elem, list_elem, ret;
+	WT_DECL_RET;
+	int i, elem, list_elem;
 	const char *key, *name, *value;
 	char *buf, *filename, *p, *t, *sep;
 
-	ret = 0;
-
 	/* Get the name. */
 	if ((name = strchr(uri, ':')) == NULL) {
 		fprintf(stderr, "%s: %s: corrupted uri\n", progname, uri);
@@ -294,10 +293,8 @@ schema_table(WT_SESSION *session, WT_CURSOR *cursor, const char *uri)
 static int
 schema_file(WT_SESSION *session, WT_CURSOR *cursor, const char *uri)
 {
+	WT_DECL_RET;
 	const char *key, *value;
-	int ret;
-
-	ret = 0;
 
 	cursor->set_key(cursor, uri);
 	if ((ret = cursor->search(cursor)) != 0)
@@ -349,8 +346,8 @@ static int
 print_config(WT_SESSION *session,
     const char *key, const char *v1, const char *v2)
 {
+	WT_DECL_RET;
 	const char *value_ret;
-	int ret;
 
 	/*
 	 * The underlying call will ignore v2 if v1 is NULL -- check here and
diff --git a/src/utilities/util_dumpfile.c b/src/utilities/util_dumpfile.c
index c415bf9f1ba..2edbbf88322 100644
--- a/src/utilities/util_dumpfile.c
+++ b/src/utilities/util_dumpfile.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_dumpfile(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	char *name;
 
 	name = NULL;
diff --git a/src/utilities/util_list.c b/src/utilities/util_list.c
index 9fc858cf948..00ef17fdbcd 100644
--- a/src/utilities/util_list.c
+++ b/src/utilities/util_list.c
@@ -14,7 +14,8 @@ static int usage(void);
 int
 util_list(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret, sflag, vflag;
+	WT_DECL_RET;
+	int ch, sflag, vflag;
 	char *name;
 
 	sflag = vflag = 0;
@@ -62,11 +63,9 @@ static int
 list_print(WT_SESSION *session, const char *name, int sflag, int vflag)
 {
 	WT_CURSOR *cursor;
-	int ret;
+	WT_DECL_RET;
 	const char *key, *value;
 
-	ret = 0;
-
 	/* Open the schema file. */
 	if ((ret = session->open_cursor(
 	    session, WT_SCHEMA_URI, NULL, NULL, &cursor)) != 0) {
@@ -124,11 +123,11 @@ list_print(WT_SESSION *session, const char *name, int sflag, int vflag)
 static int
 list_print_snapshot(WT_SESSION *session, const char *config)
 {
+	WT_DECL_RET;
 	WT_SNAPSHOT *snap, *snapbase;
 	size_t len;
 	time_t t;
 	uint64_t v;
-	int ret;
 	char buf[256];
 
 	/*
diff --git a/src/utilities/util_load.c b/src/utilities/util_load.c
index 0940f21d8e1..f753b39c5ab 100644
--- a/src/utilities/util_load.c
+++ b/src/utilities/util_load.c
@@ -72,7 +72,8 @@ static int
 load_dump(WT_SESSION *session)
 {
 	WT_CURSOR *cursor;
-	int hex, ret, tret;
+	WT_DECL_RET;
+	int hex, tret;
 	char **entry, **list, *p, *uri, config[64];
 
 	list = NULL;            /* -Wuninitialized */
@@ -383,8 +384,9 @@ static int
 insert(WT_CURSOR *cursor, const char *name)
 {
 	ULINE key, value;
+	WT_DECL_RET;
 	uint64_t insert_count;
-	int eof, ret;
+	int eof;
 
 	memset(&key, 0, sizeof(key));
 	memset(&value, 0, sizeof(value));
diff --git a/src/utilities/util_loadtext.c b/src/utilities/util_loadtext.c
index 1121a02c31f..1e12d91dc82 100644
--- a/src/utilities/util_loadtext.c
+++ b/src/utilities/util_loadtext.c
@@ -49,7 +49,8 @@ static int
 text(WT_SESSION *session, const char *uri)
 {
 	WT_CURSOR *cursor;
-	int readkey, ret, tret;
+	WT_DECL_RET;
+	int readkey, tret;
 
 	/*
 	 * Open the cursor, configured to append new records (in the case of
@@ -102,8 +103,9 @@ static int
 insert(WT_CURSOR *cursor, const char *name, int readkey)
 {
 	ULINE key, value;
+	WT_DECL_RET;
 	uint64_t insert_count;
-	int eof, ret;
+	int eof;
 
 	memset(&key, 0, sizeof(key));
 	memset(&value, 0, sizeof(value));
diff --git a/src/utilities/util_main.c b/src/utilities/util_main.c
index 7fe3015f1b9..e6045c463bc 100644
--- a/src/utilities/util_main.c
+++ b/src/utilities/util_main.c
@@ -20,12 +20,12 @@ int
 main(int argc, char *argv[])
 {
 	WT_CONNECTION *conn;
+	WT_DECL_RET;
 	WT_SESSION *session;
-	int ch, major_v, minor_v, ret, tret;
+	int ch, major_v, minor_v, tret;
 	const char *config;
 
 	conn = NULL;
-	ret = 0;
 
 	/* Get the program name. */
 	if ((progname = strrchr(argv[0], '/')) == NULL)
diff --git a/src/utilities/util_printlog.c b/src/utilities/util_printlog.c
index 300cedd9daf..e19c1ed787c 100644
--- a/src/utilities/util_printlog.c
+++ b/src/utilities/util_printlog.c
@@ -13,8 +13,9 @@ int
 util_printlog(WT_SESSION *session, int argc, char *argv[])
 {
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	WT_ITEM key, value;
-	int ch, printable, ret;
+	int ch, printable;
 
 	printable = 0;
 	while ((ch = util_getopt(argc, argv, "f:p")) != EOF)
diff --git a/src/utilities/util_read.c b/src/utilities/util_read.c
index c3d10368105..7116f853a29 100644
--- a/src/utilities/util_read.c
+++ b/src/utilities/util_read.c
@@ -13,12 +13,11 @@ int
 util_read(WT_SESSION *session, int argc, char *argv[])
 {
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	uint64_t recno;
-	int ch, rkey, ret, rval;
+	int ch, rkey, rval;
 	const char *uri, *value;
 
-	ret = 0;
-
 	while ((ch = util_getopt(argc, argv, "")) != EOF)
 		switch (ch) {
 		case '?':
diff --git a/src/utilities/util_rename.c b/src/utilities/util_rename.c
index 22e5067a460..6f894e2e9c7 100644
--- a/src/utilities/util_rename.c
+++ b/src/utilities/util_rename.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_rename(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	char *uri, *newname;
 
 	uri = NULL;
diff --git a/src/utilities/util_salvage.c b/src/utilities/util_salvage.c
index 8f61fa3a906..8821e673df1 100644
--- a/src/utilities/util_salvage.c
+++ b/src/utilities/util_salvage.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_salvage(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	const char *force;
 	char *name;
 
diff --git a/src/utilities/util_stat.c b/src/utilities/util_stat.c
index 988ebba86b6..770e68a81f8 100644
--- a/src/utilities/util_stat.c
+++ b/src/utilities/util_stat.c
@@ -13,9 +13,10 @@ int
 util_stat(WT_SESSION *session, int argc, char *argv[])
 {
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	uint64_t v;
 	size_t urilen;
-	int ch, objname_free, ret;
+	int ch, objname_free;
 	const char *pval, *desc;
 	char *objname, *uri;
 
diff --git a/src/utilities/util_upgrade.c b/src/utilities/util_upgrade.c
index 9f8ac6c8949..1529d0b611c 100644
--- a/src/utilities/util_upgrade.c
+++ b/src/utilities/util_upgrade.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_upgrade(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	char *name;
 
 	name = NULL;
diff --git a/src/utilities/util_verify.c b/src/utilities/util_verify.c
index 1efa143cedd..7ac74178217 100644
--- a/src/utilities/util_verify.c
+++ b/src/utilities/util_verify.c
@@ -12,7 +12,8 @@ static int usage(void);
 int
 util_verify(WT_SESSION *session, int argc, char *argv[])
 {
-	int ch, ret;
+	WT_DECL_RET;
+	int ch;
 	char *name;
 
 	name = NULL;
diff --git a/src/utilities/util_write.c b/src/utilities/util_write.c
index c7bb6fb654e..e4d48de681c 100644
--- a/src/utilities/util_write.c
+++ b/src/utilities/util_write.c
@@ -13,13 +13,13 @@ int
 util_write(WT_SESSION *session, int argc, char *argv[])
 {
 	WT_CURSOR *cursor;
+	WT_DECL_RET;
 	uint64_t recno;
-	int append, ch, overwrite, rkey, ret;
+	int append, ch, overwrite, rkey;
 	const char *uri;
 	char config[100];
 
-	append = overwrite = ret = 0;
-
+	append = overwrite = 0;
 	while ((ch = util_getopt(argc, argv, "ao")) != EOF)
 		switch (ch) {
 		case 'a':