1 files changed, 15 insertions, 19 deletions

diff --git a/src/utilities/util_verify.c b/src/utilities/util_verify.c
index 82bdd780cd3..d0587fcfc8c 100644
--- a/src/utilities/util_verify.c
+++ b/src/utilities/util_verify.c
@@ -17,10 +17,10 @@ util_verify(WT_SESSION *session, int argc, char *argv[])
 	size_t size;
 	int ch;
 	bool dump_address, dump_blocks, dump_layout, dump_pages;
-	char *config, *dump_offsets, *name;
+	char *config, *dump_offsets, *uri;
 
 	dump_address = dump_blocks = dump_layout = dump_pages = false;
-	config = dump_offsets = name = NULL;
+	config = dump_offsets = uri = NULL;
 	while ((ch = __wt_getopt(progname, argc, argv, "d:")) != EOF)
 		switch (ch) {
 		case 'd':
@@ -55,7 +55,7 @@ util_verify(WT_SESSION *session, int argc, char *argv[])
 	/* The remaining argument is the table name. */
 	if (argc != 1)
 		return (usage());
-	if ((name = util_name(session, *argv, "table")) == NULL)
+	if ((uri = util_uri(session, *argv, "table")) == NULL)
 		return (1);
 
 	/* Build the configuration string as necessary. */
@@ -69,7 +69,7 @@ util_verify(WT_SESSION *session, int argc, char *argv[])
 		    strlen("dump_offsets[],") +
 		    (dump_offsets == NULL ? 0 : strlen(dump_offsets)) + 20;
 		if ((config = malloc(size)) == NULL) {
-			(void)util_err(session, errno, NULL);
+			ret = util_err(session, errno, NULL);
 			goto err;
 		}
 		snprintf(config, size,
@@ -82,23 +82,19 @@ util_verify(WT_SESSION *session, int argc, char *argv[])
 		    dump_offsets != NULL ? "]," : "",
 		    dump_pages ? "dump_pages," : "");
 	}
-	if ((ret = session->verify(session, name, config)) != 0) {
-		fprintf(stderr, "%s: verify(%s): %s\n",
-		    progname, name, session->strerror(session, ret));
-		goto err;
+	if ((ret = session->verify(session, uri, config)) != 0)
+		(void)util_err(session, ret, "session.verify: %s", uri);
+	else {
+		/*
+		 * Verbose configures a progress counter, move to the next
+		 * line.
+		 */
+		if (verbose)
+			printf("\n");
 	}
 
-	/* Verbose configures a progress counter, move to the next line. */
-	if (verbose)
-		printf("\n");
-
-	if (0) {
-err:		ret = 1;
-	}
-
-	free(config);
-	free(name);
-
+err:	free(config);
+	free(uri);
 	return (ret);
 }