1 files changed, 149 insertions, 160 deletions

diff --git a/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c b/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
index c1b892519f2..d58d73685d5 100644
--- a/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
+++ b/src/third_party/wiredtiger/ext/extractors/csv/csv_extractor.c
@@ -47,208 +47,197 @@
 
 /* Local extractor structure. */
 typedef struct {
-	WT_EXTRACTOR extractor;		/* Must come first */
-	WT_EXTENSION_API *wt_api;	/* Extension API */
-	int field;			/* Field to extract */
-	int format_isnum;		/* Field contents are numeric */
+    WT_EXTRACTOR extractor;   /* Must come first */
+    WT_EXTENSION_API *wt_api; /* Extension API */
+    int field;                /* Field to extract */
+    int format_isnum;         /* Field contents are numeric */
 } CSV_EXTRACTOR;
 
 /*
  * csv_error --
- *	Display an error from this module in a standard way.
+ *     Display an error from this module in a standard way.
  */
 static int
-csv_error(const CSV_EXTRACTOR *csv_extractor,
-    WT_SESSION *session, int err, const char *msg)
+csv_error(const CSV_EXTRACTOR *csv_extractor, WT_SESSION *session, int err, const char *msg)
 {
-	WT_EXTENSION_API *wt_api;
+    WT_EXTENSION_API *wt_api;
 
-	wt_api = csv_extractor->wt_api;
-	(void)wt_api->err_printf(wt_api, session,
-	    "csv extraction: %s: %s", msg, wt_api->strerror(wt_api, NULL, err));
-	return (err);
+    wt_api = csv_extractor->wt_api;
+    (void)wt_api->err_printf(
+      wt_api, session, "csv extraction: %s: %s", msg, wt_api->strerror(wt_api, NULL, err));
+    return (err);
 }
 
 /*
  * csv_extract --
- *	WiredTiger CSV extraction.
+ *     WiredTiger CSV extraction.
  */
 static int
-csv_extract(WT_EXTRACTOR *extractor, WT_SESSION *session,
-    const WT_ITEM *key, const WT_ITEM *value, WT_CURSOR *result_cursor)
+csv_extract(WT_EXTRACTOR *extractor, WT_SESSION *session, const WT_ITEM *key, const WT_ITEM *value,
+  WT_CURSOR *result_cursor)
 {
-	const CSV_EXTRACTOR *csv_extractor;
-	WT_EXTENSION_API *wt_api;
-	size_t len;
-	int i, ret, val;
-	char *copy, *p, *pend, *valstr;
-
-	(void)key;				/* Unused parameters */
-
-	csv_extractor = (const CSV_EXTRACTOR *)extractor;
-	wt_api = csv_extractor->wt_api;
-
-	/* Unpack the value. */
-	if ((ret = wt_api->struct_unpack(wt_api,
-	    session, value->data, value->size, "S", &valstr)) != 0)
-		return (ret);
-
-	p = valstr;
-	pend = strchr(p, ',');
-	for (i = 0; i < csv_extractor->field && pend != NULL; i++) {
-		p = pend + 1;
-		pend = strchr(p, ',');
-	}
-	if (i == csv_extractor->field) {
-		if (pend == NULL)
-			pend = p + strlen(p);
-		/*
-		 * The key we must return is a null terminated string, but p
-		 * is not necessarily NULL-terminated.  So make a copy, just
-		 * for the duration of the insert.
-		 */
-		len = (size_t)(pend - p);
-		if ((copy = malloc(len + 1)) == NULL)
-			return (errno);
-		strncpy(copy, p, len);
-		copy[len] = '\0';
-		if (csv_extractor->format_isnum) {
-			if ((val = atoi(copy)) < 0) {
-				ret = csv_error(csv_extractor,
-				    session, EINVAL, "invalid key value");
-				free(copy);
-				return (ret);
-			}
-			result_cursor->set_key(result_cursor, val);
-		} else
-			result_cursor->set_key(result_cursor, copy);
-		ret = result_cursor->insert(result_cursor);
-		free(copy);
-		if (ret != 0)
-			return (ret);
-	}
-	return (0);
+    const CSV_EXTRACTOR *csv_extractor;
+    WT_EXTENSION_API *wt_api;
+    size_t len;
+    int i, ret, val;
+    char *copy, *p, *pend, *valstr;
+
+    (void)key; /* Unused parameters */
+
+    csv_extractor = (const CSV_EXTRACTOR *)extractor;
+    wt_api = csv_extractor->wt_api;
+
+    /* Unpack the value. */
+    if ((ret = wt_api->struct_unpack(wt_api, session, value->data, value->size, "S", &valstr)) != 0)
+        return (ret);
+
+    p = valstr;
+    pend = strchr(p, ',');
+    for (i = 0; i < csv_extractor->field && pend != NULL; i++) {
+        p = pend + 1;
+        pend = strchr(p, ',');
+    }
+    if (i == csv_extractor->field) {
+        if (pend == NULL)
+            pend = p + strlen(p);
+        /*
+         * The key we must return is a null terminated string, but p is not necessarily
+         * NULL-terminated. So make a copy, just for the duration of the insert.
+         */
+        len = (size_t)(pend - p);
+        if ((copy = malloc(len + 1)) == NULL)
+            return (errno);
+        strncpy(copy, p, len);
+        copy[len] = '\0';
+        if (csv_extractor->format_isnum) {
+            if ((val = atoi(copy)) < 0) {
+                ret = csv_error(csv_extractor, session, EINVAL, "invalid key value");
+                free(copy);
+                return (ret);
+            }
+            result_cursor->set_key(result_cursor, val);
+        } else
+            result_cursor->set_key(result_cursor, copy);
+        ret = result_cursor->insert(result_cursor);
+        free(copy);
+        if (ret != 0)
+            return (ret);
+    }
+    return (0);
 }
 
 /*
  * csv_customize --
- *	The customize function creates a customized extractor,
- *	needed to save the field number and format.
+ *     The customize function creates a customized extractor, needed to save the field number and
+ *     format.
  */
 static int
-csv_customize(WT_EXTRACTOR *extractor, WT_SESSION *session,
-    const char *uri, WT_CONFIG_ITEM *appcfg, WT_EXTRACTOR **customp)
+csv_customize(WT_EXTRACTOR *extractor, WT_SESSION *session, const char *uri, WT_CONFIG_ITEM *appcfg,
+  WT_EXTRACTOR **customp)
 {
-	const CSV_EXTRACTOR *orig;
-	CSV_EXTRACTOR *csv_extractor;
-	WT_CONFIG_ITEM field, format;
-	WT_CONFIG_PARSER *parser;
-	WT_EXTENSION_API *wt_api;
-	long field_num;
-	int ret;
-
-	(void)uri;				/* Unused parameters */
-
-	orig = (const CSV_EXTRACTOR *)extractor;
-	wt_api = orig->wt_api;
-	if ((ret = wt_api->config_parser_open(wt_api, session, appcfg->str,
-	    appcfg->len, &parser)) != 0)
-		return (ret);
-	if ((ret = parser->get(parser, "field", &field)) != 0) {
-		if (ret == WT_NOTFOUND)
-			(void)wt_api->err_printf(
-			    wt_api, session, "field not found");
-		else
-			(void)wt_api->err_printf(
-			    wt_api, session, "WT_CONFIG_PARSER.get: field: %s",
-			    wt_api->strerror(wt_api, session, ret));
-		goto err;
-	}
-	if ((ret = parser->get(parser, "format", &format)) != 0) {
-		if (ret == WT_NOTFOUND)
-			(void)wt_api->err_printf(
-			    wt_api, session, "format not found");
-		else
-			(void)wt_api->err_printf(
-			    wt_api, session, "WT_CONFIG_PARSER.get: format: %s",
-			    wt_api->strerror(wt_api, session, ret));
-		goto err;
-	}
-	ret = parser->close(parser);
-	parser = NULL;
-	if (ret != 0) {
-		(void)wt_api->err_printf(
-		    wt_api, session, "WT_CONFIG_PARSER.close: %s",
-		    wt_api->strerror(wt_api, session, ret));
-	}
-
-	field_num = strtol(field.str, NULL, 10);
-	if (field_num < 0 || field_num > INT_MAX) {
-		(void)wt_api->err_printf(
-		    wt_api, session, "field: invalid format");
-		ret = EINVAL;
-		goto err;
-	}
-	if (format.len != 1 || (format.str[0] != 'S' && format.str[0] != 'i')) {
-		(void)wt_api->err_printf(
-		    wt_api, session, "format: invalid format");
-		ret = EINVAL;
-		goto err;
-	}
-	if ((csv_extractor = calloc(1, sizeof(CSV_EXTRACTOR))) == NULL) {
-		ret = errno;
-		goto err;
-	}
-
-	*csv_extractor = *orig;
-	csv_extractor->field = (int)field_num;
-	csv_extractor->format_isnum = (format.str[0] == 'i');
-	*customp = (WT_EXTRACTOR *)csv_extractor;
-	return (0);
-
-err:	if (parser != NULL)
-		(void)parser->close(parser);
-	return (ret);
+    const CSV_EXTRACTOR *orig;
+    CSV_EXTRACTOR *csv_extractor;
+    WT_CONFIG_ITEM field, format;
+    WT_CONFIG_PARSER *parser;
+    WT_EXTENSION_API *wt_api;
+    long field_num;
+    int ret;
+
+    (void)uri; /* Unused parameters */
+
+    orig = (const CSV_EXTRACTOR *)extractor;
+    wt_api = orig->wt_api;
+    if ((ret = wt_api->config_parser_open(wt_api, session, appcfg->str, appcfg->len, &parser)) != 0)
+        return (ret);
+    if ((ret = parser->get(parser, "field", &field)) != 0) {
+        if (ret == WT_NOTFOUND)
+            (void)wt_api->err_printf(wt_api, session, "field not found");
+        else
+            (void)wt_api->err_printf(wt_api, session, "WT_CONFIG_PARSER.get: field: %s",
+              wt_api->strerror(wt_api, session, ret));
+        goto err;
+    }
+    if ((ret = parser->get(parser, "format", &format)) != 0) {
+        if (ret == WT_NOTFOUND)
+            (void)wt_api->err_printf(wt_api, session, "format not found");
+        else
+            (void)wt_api->err_printf(wt_api, session, "WT_CONFIG_PARSER.get: format: %s",
+              wt_api->strerror(wt_api, session, ret));
+        goto err;
+    }
+    ret = parser->close(parser);
+    parser = NULL;
+    if (ret != 0) {
+        (void)wt_api->err_printf(
+          wt_api, session, "WT_CONFIG_PARSER.close: %s", wt_api->strerror(wt_api, session, ret));
+    }
+
+    field_num = strtol(field.str, NULL, 10);
+    if (field_num < 0 || field_num > INT_MAX) {
+        (void)wt_api->err_printf(wt_api, session, "field: invalid format");
+        ret = EINVAL;
+        goto err;
+    }
+    if (format.len != 1 || (format.str[0] != 'S' && format.str[0] != 'i')) {
+        (void)wt_api->err_printf(wt_api, session, "format: invalid format");
+        ret = EINVAL;
+        goto err;
+    }
+    if ((csv_extractor = calloc(1, sizeof(CSV_EXTRACTOR))) == NULL) {
+        ret = errno;
+        goto err;
+    }
+
+    *csv_extractor = *orig;
+    csv_extractor->field = (int)field_num;
+    csv_extractor->format_isnum = (format.str[0] == 'i');
+    *customp = (WT_EXTRACTOR *)csv_extractor;
+    return (0);
+
+err:
+    if (parser != NULL)
+        (void)parser->close(parser);
+    return (ret);
 }
 
 /*
  * csv_terminate --
- *	Terminate is called to free the CSV and any associated memory.
+ *     Terminate is called to free the CSV and any associated memory.
  */
 static int
 csv_terminate(WT_EXTRACTOR *extractor, WT_SESSION *session)
 {
-	(void)session;				/* Unused parameters */
+    (void)session; /* Unused parameters */
 
-	/* Free the allocated memory. */
-	free(extractor);
-	return (0);
+    /* Free the allocated memory. */
+    free(extractor);
+    return (0);
 }
 
 /*
  * wiredtiger_extension_init --
- *	WiredTiger CSV extraction extension.
+ *     WiredTiger CSV extraction extension.
  */
 int
 wiredtiger_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config)
 {
-	CSV_EXTRACTOR *csv_extractor;
-	int ret;
+    CSV_EXTRACTOR *csv_extractor;
+    int ret;
 
-	(void)config;				/* Unused parameters */
+    (void)config; /* Unused parameters */
 
-	if ((csv_extractor = calloc(1, sizeof(CSV_EXTRACTOR))) == NULL)
-		return (errno);
+    if ((csv_extractor = calloc(1, sizeof(CSV_EXTRACTOR))) == NULL)
+        return (errno);
 
-	csv_extractor->extractor.extract = csv_extract;
-	csv_extractor->extractor.customize = csv_customize;
-	csv_extractor->extractor.terminate = csv_terminate;
-	csv_extractor->wt_api = connection->get_extension_api(connection);
+    csv_extractor->extractor.extract = csv_extract;
+    csv_extractor->extractor.customize = csv_customize;
+    csv_extractor->extractor.terminate = csv_terminate;
+    csv_extractor->wt_api = connection->get_extension_api(connection);
 
-	if ((ret = connection->add_extractor(
-	    connection, "csv", (WT_EXTRACTOR *)csv_extractor, NULL)) == 0)
-		return (0);
+    if ((ret = connection->add_extractor(connection, "csv", (WT_EXTRACTOR *)csv_extractor, NULL)) ==
+      0)
+        return (0);
 
-	free(csv_extractor);
-	return (ret);
+    free(csv_extractor);
+    return (ret);
 }