1 files changed, 125 insertions, 131 deletions

diff --git a/src/third_party/wiredtiger/src/utilities/util_loadtext.c b/src/third_party/wiredtiger/src/utilities/util_loadtext.c
index f1e3c9a3e87..1d4414b47b5 100644
--- a/src/third_party/wiredtiger/src/utilities/util_loadtext.c
+++ b/src/third_party/wiredtiger/src/utilities/util_loadtext.c
@@ -15,156 +15,150 @@ static int usage(void);
 int
 util_loadtext(WT_SESSION *session, int argc, char *argv[])
 {
-	WT_DECL_RET;
-	int ch;
-	char *uri;
-
-	uri = NULL;
-	while ((ch = __wt_getopt(progname, argc, argv, "f:")) != EOF)
-		switch (ch) {
-		case 'f':	/* input file */
-			if (freopen(__wt_optarg, "r", stdin) == NULL)
-				return (util_err(
-				    session, errno, "%s: reopen", __wt_optarg));
-			break;
-		case '?':
-		default:
-			return (usage());
-		}
-	argc -= __wt_optind;
-	argv += __wt_optind;
-
-	/* The remaining argument is the uri. */
-	if (argc != 1)
-		return (usage());
-	if ((uri = util_uri(session, *argv, "table")) == NULL)
-		return (1);
-
-	ret = text(session, uri);
-
-	free(uri);
-	return (ret);
+    WT_DECL_RET;
+    int ch;
+    char *uri;
+
+    uri = NULL;
+    while ((ch = __wt_getopt(progname, argc, argv, "f:")) != EOF)
+        switch (ch) {
+        case 'f': /* input file */
+            if (freopen(__wt_optarg, "r", stdin) == NULL)
+                return (util_err(session, errno, "%s: reopen", __wt_optarg));
+            break;
+        case '?':
+        default:
+            return (usage());
+        }
+    argc -= __wt_optind;
+    argv += __wt_optind;
+
+    /* The remaining argument is the uri. */
+    if (argc != 1)
+        return (usage());
+    if ((uri = util_uri(session, *argv, "table")) == NULL)
+        return (1);
+
+    ret = text(session, uri);
+
+    free(uri);
+    return (ret);
 }
 
 /*
  * text --
- *	Load flat-text into a file/table.
+ *     Load flat-text into a file/table.
  */
 static int
 text(WT_SESSION *session, const char *uri)
 {
-	WT_CURSOR *cursor;
-	WT_DECL_RET;
-	int tret;
-	bool readkey;
-
-	/*
-	 * Open the cursor, configured to append new records (in the case of
-	 * column-store objects), or to overwrite existing strings (in the
-	 * case of row-store objects).  The two flags are mutually exclusive,
-	 * but the library doesn't currently care that we set both of them.
-	 */
-	if ((ret = session->open_cursor(
-	    session, uri, NULL, "append,overwrite", &cursor)) != 0)
-		return (util_err(session, ret, "%s: session.open_cursor", uri));
-
-	/*
-	 * We're about to load strings, make sure the formats match.
-	 *
-	 * Row-store tables have key/value pairs, column-store tables only have
-	 * values.
-	 */
-	if (!WT_STREQ(cursor->value_format, "S") ||
-	    (!WT_STREQ(cursor->key_format, "S") &&
-	    !WT_STREQ(cursor->key_format, "r")))
-		return (util_err(session, EINVAL,
-		    "the loadtext command can only load objects configured "
-		    "for record number or string keys, and string values"));
-	readkey = !WT_STREQ(cursor->key_format, "r");
-
-	/* Insert the records */
-	ret = insert(cursor, uri, readkey);
-
-	/*
-	 * Technically, we don't have to close the cursor because the session
-	 * handle will do it for us, but I'd like to see the flush to disk and
-	 * the close succeed, it's better to fail early when loading files.
-	 */
-	if ((tret = cursor->close(cursor)) != 0) {
-		tret = util_err(session, tret, "%s: cursor.close", uri);
-		if (ret == 0)
-			ret = tret;
-	}
-	if (ret == 0)
-		ret = util_flush(session, uri);
-
-	return (ret == 0 ? 0 : 1);
+    WT_CURSOR *cursor;
+    WT_DECL_RET;
+    int tret;
+    bool readkey;
+
+    /*
+     * Open the cursor, configured to append new records (in the case of column-store objects), or
+     * to overwrite existing strings (in the case of row-store objects). The two flags are mutually
+     * exclusive, but the library doesn't currently care that we set both of them.
+     */
+    if ((ret = session->open_cursor(session, uri, NULL, "append,overwrite", &cursor)) != 0)
+        return (util_err(session, ret, "%s: session.open_cursor", uri));
+
+    /*
+     * We're about to load strings, make sure the formats match.
+     *
+     * Row-store tables have key/value pairs, column-store tables only have
+     * values.
+     */
+    if (!WT_STREQ(cursor->value_format, "S") ||
+      (!WT_STREQ(cursor->key_format, "S") && !WT_STREQ(cursor->key_format, "r")))
+        return (util_err(session, EINVAL,
+          "the loadtext command can only load objects configured "
+          "for record number or string keys, and string values"));
+    readkey = !WT_STREQ(cursor->key_format, "r");
+
+    /* Insert the records */
+    ret = insert(cursor, uri, readkey);
+
+    /*
+     * Technically, we don't have to close the cursor because the session handle will do it for us,
+     * but I'd like to see the flush to disk and the close succeed, it's better to fail early when
+     * loading files.
+     */
+    if ((tret = cursor->close(cursor)) != 0) {
+        tret = util_err(session, tret, "%s: cursor.close", uri);
+        if (ret == 0)
+            ret = tret;
+    }
+    if (ret == 0)
+        ret = util_flush(session, uri);
+
+    return (ret == 0 ? 0 : 1);
 }
 
 /*
  * insert --
- *	Read and insert data.
+ *     Read and insert data.
  */
 static int
 insert(WT_CURSOR *cursor, const char *name, bool readkey)
 {
-	ULINE key, value;
-	WT_DECL_RET;
-	WT_SESSION *session;
-	uint64_t insert_count;
-	bool eof;
-
-	session = cursor->session;
-
-	memset(&key, 0, sizeof(key));
-	memset(&value, 0, sizeof(value));
-
-	/* Read key/value pairs and insert them into the file. */
-	for (insert_count = 0;;) {
-		/*
-		 * Three modes: in row-store, we always read a key and use it,
-		 * in column-store, we might read it (a dump), we might read
-		 * and ignore it (a dump with "append" set), or not read it at
-		 * all (flat-text load).
-		 */
-		if (readkey) {
-			if (util_read_line(session, &key, true, &eof))
-				return (1);
-			if (eof)
-				break;
-			cursor->set_key(cursor, key.mem);
-		}
-		if (util_read_line(session, &value, !readkey, &eof))
-			return (1);
-		if (eof)
-			break;
-		cursor->set_value(cursor, value.mem);
-
-		if ((ret = cursor->insert(cursor)) != 0)
-			return (
-			    util_err(session, ret, "%s: cursor.insert", name));
-
-		/* Report on progress every 100 inserts. */
-		if (verbose && ++insert_count % 100 == 0) {
-			printf("\r\t%s: %" PRIu64, name, insert_count);
-			fflush(stdout);
-		}
-	}
-	free(key.mem);
-	free(value.mem);
-
-	if (verbose)
-		printf("\r\t%s: %" PRIu64 "\n", name, insert_count);
-
-	return (0);
+    ULINE key, value;
+    WT_DECL_RET;
+    WT_SESSION *session;
+    uint64_t insert_count;
+    bool eof;
+
+    session = cursor->session;
+
+    memset(&key, 0, sizeof(key));
+    memset(&value, 0, sizeof(value));
+
+    /* Read key/value pairs and insert them into the file. */
+    for (insert_count = 0;;) {
+        /*
+         * Three modes: in row-store, we always read a key and use it, in column-store, we might
+         * read it (a dump), we might read and ignore it (a dump with "append" set), or not read it
+         * at all (flat-text load).
+         */
+        if (readkey) {
+            if (util_read_line(session, &key, true, &eof))
+                return (1);
+            if (eof)
+                break;
+            cursor->set_key(cursor, key.mem);
+        }
+        if (util_read_line(session, &value, !readkey, &eof))
+            return (1);
+        if (eof)
+            break;
+        cursor->set_value(cursor, value.mem);
+
+        if ((ret = cursor->insert(cursor)) != 0)
+            return (util_err(session, ret, "%s: cursor.insert", name));
+
+        /* Report on progress every 100 inserts. */
+        if (verbose && ++insert_count % 100 == 0) {
+            printf("\r\t%s: %" PRIu64, name, insert_count);
+            fflush(stdout);
+        }
+    }
+    free(key.mem);
+    free(value.mem);
+
+    if (verbose)
+        printf("\r\t%s: %" PRIu64 "\n", name, insert_count);
+
+    return (0);
 }
 
 static int
 usage(void)
 {
-	(void)fprintf(stderr,
-	    "usage: %s %s "
-	    "loadtext [-f input-file] uri\n",
-	    progname, usage_prefix);
-	return (1);
+    (void)fprintf(stderr,
+      "usage: %s %s "
+      "loadtext [-f input-file] uri\n",
+      progname, usage_prefix);
+    return (1);
 }