Remove the config string from WT_CURSOR::close: it is no longer required and simplifies the code.

42 files changed, 96 insertions, 114 deletions

diff --git a/dist/s_define.list b/dist/s_define.list
index 3d9b7504679..a70ed526852 100644
--- a/dist/s_define.list
+++ b/dist/s_define.list
@@ -2,7 +2,6 @@
 ALIGN_CHECK
 API_CALL
 API_CALL_NOCONF
-API_CALL_TRET
 API_SESSION_INIT
 FLD_CLR
 FLD_ISSET
diff --git a/examples/c/ex_all.c b/examples/c/ex_all.c
index cc1aa784c94..88d01cb467c 100644
--- a/examples/c/ex_all.c
+++ b/examples/c/ex_all.c
@@ -217,7 +217,7 @@ cursor_ops(WT_SESSION *session)
 	}
 
 	/*! [Close the cursor] */
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 	/*! [Close the cursor] */
 
 	return (ret);
diff --git a/examples/c/ex_call_center.c b/examples/c/ex_call_center.c
index adea405228d..84e1ee955c8 100644
--- a/examples/c/ex_call_center.c
+++ b/examples/c/ex_call_center.c
@@ -146,7 +146,7 @@ int main(void)
 	cursor->set_value(cursor, "Lorelei", "Sevii Islands", "098-765-4321");
 	ret = cursor->insert(cursor);
 
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 
 	/*
 	 * First query: a call arrives.  In SQL:
@@ -170,7 +170,7 @@ int main(void)
 		ret = cursor->get_value(cursor, &cust.id, &cust.name);
 		printf("Got customer record for %s\n", cust.name);
 	}
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 
 	/*
 	 * Next query: get the recent order history.  In SQL:
diff --git a/examples/c/ex_cursor.c b/examples/c/ex_cursor.c
index 6d3d60d67bf..58efc7f8624 100644
--- a/examples/c/ex_cursor.c
+++ b/examples/c/ex_cursor.c
@@ -202,7 +202,7 @@ int main(void)
 	ret = cursor_reverse_scan(cursor);
 	ret = cursor_update(cursor);
 	ret = cursor_remove(cursor);
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 
 	/* Note: closing the connection implicitly closes open session(s). */
 	if ((ret = conn->close(conn, NULL)) != 0)
diff --git a/examples/c/ex_schema.c b/examples/c/ex_schema.c
index ddd3048bd62..6e89ebd0e4d 100644
--- a/examples/c/ex_schema.c
+++ b/examples/c/ex_schema.c
@@ -110,7 +110,7 @@ int main(void)
 		cursor->set_value(cursor, p->country, p->year, p->population);
 		ret = cursor->insert(cursor);
 	}
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 
 	/* Now just read through the countries we know about */
 	ret = session->open_cursor(session,
diff --git a/src/btree/bt_cursor.c b/src/btree/bt_cursor.c
index 4baa28016f0..ab38a4e97d6 100644
--- a/src/btree/bt_cursor.c
+++ b/src/btree/bt_cursor.c
@@ -432,15 +432,13 @@ err:	__cursor_func_resolve(cbt, ret);
  *	Close a btree cursor.
  */
 int
-__wt_btcur_close(WT_CURSOR_BTREE *cbt, const char *cfg[])
+__wt_btcur_close(WT_CURSOR_BTREE *cbt)
 {
 	WT_SESSION_IMPL *session;
 
-	WT_UNUSED(cfg);
 	session = (WT_SESSION_IMPL *)cbt->iface.session;
 
 	__cursor_func_init(cbt, 1);
-
 	__wt_buf_free(session, &cbt->tmp);
 
 	return (0);
diff --git a/src/cursor/cur_bulk.c b/src/cursor/cur_bulk.c
index 3344cc4a57c..474a7e0b413 100644
--- a/src/cursor/cur_bulk.c
+++ b/src/cursor/cur_bulk.c
@@ -36,7 +36,7 @@ err:	API_END(session);
  *	WT_CURSOR->close for the bulk cursor type.
  */
 static int
-__curbulk_close(WT_CURSOR *cursor, const char *config)
+__curbulk_close(WT_CURSOR *cursor)
 {
 	WT_BTREE *btree;
 	WT_CURSOR_BULK *cbulk;
@@ -46,14 +46,13 @@ __curbulk_close(WT_CURSOR *cursor, const char *config)
 	cbulk = (WT_CURSOR_BULK *)cursor;
 	btree = cbulk->cbt.btree;
 
-	CURSOR_API_CALL_CONF(cursor, session, close, btree, config, cfg);
-	WT_UNUSED(cfg);
+	CURSOR_API_CALL(cursor, session, close, btree);
 	WT_TRET(__wt_bulk_end(cbulk));
 	if (session->btree != NULL)
 		WT_TRET(__wt_session_release_btree(session));
 	/* The URI is owned by the btree handle. */
 	cursor->uri = NULL;
-	WT_TRET(__wt_cursor_close(cursor, config));
+	WT_TRET(__wt_cursor_close(cursor));
 	API_END(session);
 
 	return (ret);
diff --git a/src/cursor/cur_config.c b/src/cursor/cur_config.c
index fd4cd883a68..c4a64d2387d 100644
--- a/src/cursor/cur_config.c
+++ b/src/cursor/cur_config.c
@@ -12,9 +12,9 @@
  *	WT_CURSOR->close method for the config cursor type.
  */
 static int
-__curconfig_close(WT_CURSOR *cursor, const char *config)
+__curconfig_close(WT_CURSOR *cursor)
 {
-	return (__wt_cursor_close(cursor, config));
+	return (__wt_cursor_close(cursor));
 }
 
 /*
diff --git a/src/cursor/cur_file.c b/src/cursor/cur_file.c
index 5363edfc79c..06ffb47328c 100644
--- a/src/cursor/cur_file.c
+++ b/src/cursor/cur_file.c
@@ -172,20 +172,20 @@ err:	API_END(session);
  *	WT_CURSOR->close method for the btree cursor type.
  */
 static int
-__curfile_close(WT_CURSOR *cursor, const char *config)
+__curfile_close(WT_CURSOR *cursor)
 {
 	WT_CURSOR_BTREE *cbt;
 	WT_SESSION_IMPL *session;
 	int ret;
 
 	cbt = (WT_CURSOR_BTREE *)cursor;
-	CURSOR_API_CALL_CONF(cursor, session, close, cbt->btree, config, cfg);
-	WT_TRET(__wt_btcur_close(cbt, cfg));
+	CURSOR_API_CALL(cursor, session, close, cbt->btree);
+	WT_TRET(__wt_btcur_close(cbt));
 	if (session->btree != NULL)
 		WT_TRET(__wt_session_release_btree(session));
 	/* The URI is owned by the btree handle. */
 	cursor->uri = NULL;
-	WT_TRET(__wt_cursor_close(cursor, config));
+	WT_TRET(__wt_cursor_close(cursor));
 	API_END(session);
 
 	return (ret);
diff --git a/src/cursor/cur_index.c b/src/cursor/cur_index.c
index 9a9d130ae97..05762e44592 100644
--- a/src/cursor/cur_index.c
+++ b/src/cursor/cur_index.c
@@ -261,7 +261,7 @@ __curindex_search_near(WT_CURSOR *cursor, int *exact)
  *	WT_CURSOR->close method for index cursors.
  */
 static int
-__curindex_close(WT_CURSOR *cursor, const char *config)
+__curindex_close(WT_CURSOR *cursor)
 {
 	WT_BTREE *btree;
 	WT_CURSOR_INDEX *cindex;
@@ -272,12 +272,12 @@ __curindex_close(WT_CURSOR *cursor, const char *config)
 	cindex = (WT_CURSOR_INDEX *)cursor;
 	btree = cindex->cbt.btree;
 
-	CURSOR_API_CALL_CONF(cursor, session, close, btree, config, cfg);
+	CURSOR_API_CALL(cursor, session, close, btree);
 
 	for (i = 0, cp = (cindex)->cg_cursors;
 	    i < WT_COLGROUPS(cindex->table); i++, cp++)
 		if (*cp != NULL) {
-			WT_TRET((*cp)->close(*cp, config));
+			WT_TRET((*cp)->close(*cp));
 			*cp = NULL;
 		}
 
@@ -289,11 +289,11 @@ __curindex_close(WT_CURSOR *cursor, const char *config)
 	if (cursor->value_format != cindex->table->value_format)
 		__wt_free(session, cindex->value_plan);
 
-	WT_TRET(__wt_btcur_close(&cindex->cbt, cfg));
+	WT_TRET(__wt_btcur_close(&cindex->cbt));
 	WT_TRET(__wt_session_release_btree(session));
 	/* The URI is owned by the btree handle. */
 	cursor->uri = NULL;
-	WT_TRET(__wt_cursor_close(cursor, config));
+	WT_TRET(__wt_cursor_close(cursor));
 	API_END(session);
 
 	return (ret);
@@ -430,7 +430,7 @@ __wt_curindex_open(WT_SESSION_IMPL *session,
 	*cursorp = cursor;
 
 	if (0) {
-err:		(void)__curindex_close(cursor, NULL);
+err:		(void)__curindex_close(cursor);
 	}
 
 	return (ret);
diff --git a/src/cursor/cur_stat.c b/src/cursor/cur_stat.c
index 226fc5495fe..48fc25730b2 100644
--- a/src/cursor/cur_stat.c
+++ b/src/cursor/cur_stat.c
@@ -270,15 +270,14 @@ err:	API_END(session);
  *	WT_CURSOR->close method for the statistics cursor type.
  */
 static int
-__curstat_close(WT_CURSOR *cursor, const char *config)
+__curstat_close(WT_CURSOR *cursor)
 {
 	WT_CURSOR_STAT *cst;
 	WT_SESSION_IMPL *session;
 	int ret;
 
 	ret = 0;
-	CURSOR_API_CALL_CONF(cursor, session, close, NULL, config, cfg);
-	WT_UNUSED(cfg);
+	CURSOR_API_CALL(cursor, session, close, NULL);
 	cst = (WT_CURSOR_STAT *)cursor;
 
 	if (ret == 0 && cst->clear_func)
@@ -292,7 +291,7 @@ __curstat_close(WT_CURSOR *cursor, const char *config)
 		session->btree = NULL;
 	}
 
-	WT_TRET(__wt_cursor_close(cursor, config));
+	WT_TRET(__wt_cursor_close(cursor));
 
 	API_END(session);
 	return (ret);
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index 06029ec2f70..1619f6cf9b9 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -283,13 +283,12 @@ done:	API_END(session);
  *	WT_CURSOR->close default implementation.
  */
 int
-__wt_cursor_close(WT_CURSOR *cursor, const char *config)
+__wt_cursor_close(WT_CURSOR *cursor)
 {
 	WT_SESSION_IMPL *session;
 	int ret;
 
-	CURSOR_API_CALL_CONF(cursor, session, close, NULL, config, cfg);
-	WT_UNUSED(cfg);
+	CURSOR_API_CALL(cursor, session, close, NULL);
 
 	__wt_buf_free(session, &cursor->key);
 	__wt_buf_free(session, &cursor->value);
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index fc493390c76..68659efd6bf 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -397,7 +397,7 @@ err:	API_END(session);
  *	WT_CURSOR->close method for the table cursor type.
  */
 static int
-__curtable_close(WT_CURSOR *cursor, const char *config)
+__curtable_close(WT_CURSOR *cursor)
 {
 	WT_CURSOR_TABLE *ctable;
 	WT_CURSOR **cp;
@@ -405,13 +405,12 @@ __curtable_close(WT_CURSOR *cursor, const char *config)
 	int i, ret;
 
 	ctable = (WT_CURSOR_TABLE *)cursor;
-	CURSOR_API_CALL_CONF(cursor, session, close, NULL, config, cfg);
-	WT_UNUSED(cfg);
+	CURSOR_API_CALL(cursor, session, close, NULL);
 
 	for (i = 0, cp = (ctable)->cg_cursors;
 	    i < WT_COLGROUPS(ctable->table); i++, cp++)
 		if (*cp != NULL) {
-			WT_TRET((*cp)->close(*cp, config));
+			WT_TRET((*cp)->close(*cp));
 			*cp = NULL;
 		}
 
@@ -419,7 +418,7 @@ __curtable_close(WT_CURSOR *cursor, const char *config)
 		for (i = 0, cp = (ctable)->idx_cursors;
 		    i < ctable->table->nindices; i++, cp++)
 			if (*cp != NULL) {
-				WT_TRET((*cp)->close(*cp, config));
+				WT_TRET((*cp)->close(*cp));
 				*cp = NULL;
 			}
 
@@ -429,7 +428,7 @@ __curtable_close(WT_CURSOR *cursor, const char *config)
 	__wt_free(session, ctable->idx_cursors);
 	/* The URI is owned by the table. */
 	cursor->uri = NULL;
-	WT_TRET(__wt_cursor_close(cursor, config));
+	WT_TRET(__wt_cursor_close(cursor));
 	API_END(session);
 
 	return (ret);
@@ -634,7 +633,7 @@ __wt_curtable_open(WT_SESSION_IMPL *session,
 	*cursorp = cursor;
 
 	if (0) {
-err:		(void)__curtable_close(cursor, NULL);
+err:		(void)__curtable_close(cursor);
 	}
 
 	return (ret);
diff --git a/src/include/api.h b/src/include/api.h
index 7bdd55e595c..355f74ea65f 100644
--- a/src/include/api.h
+++ b/src/include/api.h
@@ -228,12 +228,6 @@ struct __wt_connection_impl {
 	WT_ERR(((cfg) != NULL) ?					\
 	    __wt_config_check((s), __wt_confchk_##h##_##n, (cfg)) : 0)
 
-#define	API_CALL_TRET(s, h, n, cur, bt, cfg, cfgvar) do {		\
-	const char *cfgvar[] = API_CONF_DEFAULTS(h, n, cfg);		\
-	API_SESSION_INIT(s, h, n, cur, bt);				\
-	WT_TRET(((cfg) != NULL) ?					\
-	    __wt_config_check((s), __wt_confchk_##h##_##n, (cfg)) : 0)
-
 #define	API_END(s)							\
 	if ((s) != NULL) {						\
 		(s)->btree = __oldbtree;				\
@@ -252,10 +246,6 @@ struct __wt_connection_impl {
 	(s) = (WT_SESSION_IMPL *)(cur)->session;			\
 	API_CALL_NOCONF(s, cursor, n, (cur), bt);			\
 
-#define	CURSOR_API_CALL_CONF(cur, s, n, bt, cfg, cfgvar)		\
-	(s) = (WT_SESSION_IMPL *)(cur)->session;			\
-	API_CALL_TRET(s, cursor, n, cur, bt, cfg, cfgvar);		\
-
 /*******************************************
  * Global variables.
  *******************************************/
diff --git a/src/include/extern.h b/src/include/extern.h
index 88671f98b3d..329115790e4 100644
--- a/src/include/extern.h
+++ b/src/include/extern.h
@@ -163,7 +163,7 @@ extern int __wt_btcur_search_near(WT_CURSOR_BTREE *cbt, int *exact);
 extern int __wt_btcur_insert(WT_CURSOR_BTREE *cbt);
 extern int __wt_btcur_remove(WT_CURSOR_BTREE *cbt);
 extern int __wt_btcur_update(WT_CURSOR_BTREE *cbt);
-extern int __wt_btcur_close(WT_CURSOR_BTREE *cbt, const char *cfg[]);
+extern int __wt_btcur_close(WT_CURSOR_BTREE *cbt);
 extern int __wt_debug_addr( WT_SESSION_IMPL *session,
     uint32_t addr,
     uint32_t size,
@@ -467,7 +467,7 @@ extern int __wt_cursor_get_value(WT_CURSOR *cursor, ...);
 extern void __wt_cursor_set_key(WT_CURSOR *cursor, ...);
 extern void __wt_cursor_set_keyv(WT_CURSOR *cursor, uint32_t flags, va_list ap);
 extern void __wt_cursor_set_value(WT_CURSOR *cursor, ...);
-extern int __wt_cursor_close(WT_CURSOR *cursor, const char *config);
+extern int __wt_cursor_close(WT_CURSOR *cursor);
 extern int __wt_cursor_init(WT_CURSOR *cursor,
     const char *uri,
     int is_file,
diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in
index f932a66ef84..802d17695f7 100644
--- a/src/include/wiredtiger.in
+++ b/src/include/wiredtiger.in
@@ -366,10 +366,9 @@ struct __wt_cursor {
 	 * @snippet ex_all.c Close the cursor
 	 *
 	 * @param cursor the cursor handle
-	 * @configempty{cursor.close, see dist/api_data.py}
 	 * @errors
 	 */
-	int __F(close)(WT_CURSOR *cursor, const char *config);
+	int __F(close)(WT_CURSOR *cursor);
 
 	/*
 	 * Protected fields, only to be used by cursor implementations.
diff --git a/src/schema/schema_open.c b/src/schema/schema_open.c
index 4b86ba274f2..911cb690280 100644
--- a/src/schema/schema_open.c
+++ b/src/schema/schema_open.c
@@ -75,7 +75,7 @@ __wt_schema_get_btree(WT_SESSION_IMPL *session,
 	fileuri = uribuf.data;
 
 	/* !!! Close the schema cursor first, this overwrites session->btree. */
-	ret = cursor->close(cursor, NULL);
+	ret = cursor->close(cursor);
 	cursor = NULL;
 	if (ret != 0)
 		goto err;
@@ -89,7 +89,7 @@ err:	__wt_buf_free(session, &uribuf);
 	if (name != objname)
 		__wt_free(session, name);
 	if (cursor != NULL)
-		WT_TRET(cursor->close(cursor, NULL));
+		WT_TRET(cursor->close(cursor));
 	return (ret);
 }
 
@@ -315,7 +315,7 @@ __wt_schema_open_index(
 		}
 
 		if (match) {
-			ret = cursor->close(cursor, NULL);
+			ret = cursor->close(cursor);
 			cursor = NULL;
 			session->btree = table->index[i];
 			break;
@@ -333,7 +333,7 @@ __wt_schema_open_index(
 	}
 
 err:	if (cursor != NULL)
-		WT_TRET(cursor->close(cursor, NULL));
+		WT_TRET(cursor->close(cursor));
 	return (ret);
 }
 
@@ -408,7 +408,7 @@ __wt_schema_open_table(WT_SESSION_IMPL *session,
 	*tablep = table;
 
 err:	if (cursor != NULL)
-		WT_TRET(cursor->close(cursor, NULL));
+		WT_TRET(cursor->close(cursor));
 	__wt_free(session, tablename);
 	return (ret);
 }
diff --git a/src/schema/schema_table.c b/src/schema/schema_table.c
index 6e572d98ec9..869a04da66c 100644
--- a/src/schema/schema_table.c
+++ b/src/schema/schema_table.c
@@ -69,7 +69,7 @@ __wt_schema_table_insert(
 	cursor->set_key(cursor, key);
 	cursor->set_value(cursor, value);
 	WT_TRET(cursor->insert(cursor));
-	WT_TRET(cursor->close(cursor, NULL));
+	WT_TRET(cursor->close(cursor));
 	return (ret);
 }
 
@@ -93,7 +93,7 @@ __wt_schema_table_update(
 	cursor->set_key(cursor, key);
 	cursor->set_value(cursor, value);
 	WT_TRET(cursor->insert(cursor));
-	WT_TRET(cursor->close(cursor, NULL));
+	WT_TRET(cursor->close(cursor));
 	return (ret);
 }
 
@@ -115,7 +115,7 @@ __wt_schema_table_remove(WT_SESSION_IMPL *session, const char *key)
 	WT_RET(__wt_schema_table_cursor(session, NULL, &cursor));
 	cursor->set_key(cursor, key);
 	WT_TRET(cursor->remove(cursor));
-	WT_TRET(cursor->close(cursor, NULL));
+	WT_TRET(cursor->close(cursor));
 	return (ret);
 }
 
@@ -140,6 +140,6 @@ __wt_schema_table_read(
 	WT_ERR(cursor->get_value(cursor, &value));
 	WT_ERR(__wt_strdup(session, value, valuep));
 
-err:    WT_TRET(cursor->close(cursor, NULL));
+err:    WT_TRET(cursor->close(cursor));
 	return (ret);
 }
diff --git a/src/session/session_api.c b/src/session/session_api.c
index 6015f021eba..368a446b0b0 100644
--- a/src/session/session_api.c
+++ b/src/session/session_api.c
@@ -33,10 +33,10 @@ __session_close(WT_SESSION *wt_session, const char *config)
 	 * to work out whether pages are in use.
 	 */
 	while ((cursor = TAILQ_FIRST(&session->public_cursors)) != NULL)
-		WT_TRET(cursor->close(cursor, config));
+		WT_TRET(cursor->close(cursor));
 
 	while ((cursor = TAILQ_FIRST(&session->file_cursors)) != NULL)
-		WT_TRET(cursor->close(cursor, config));
+		WT_TRET(cursor->close(cursor));
 
 	while ((btree_session = TAILQ_FIRST(&session->btrees)) != NULL)
 		WT_TRET(__wt_session_remove_btree(session, btree_session));
diff --git a/src/utilities/util_dump.c b/src/utilities/util_dump.c
index 37af5adf428..2c946c2568b 100644
--- a/src/utilities/util_dump.c
+++ b/src/utilities/util_dump.c
@@ -137,7 +137,7 @@ schema(WT_SESSION *session, const char *uri)
 	else
 		ret = schema_file(cursor, uri);
 
-	if ((tret = cursor->close(cursor, NULL)) != 0 && ret == 0)
+	if ((tret = cursor->close(cursor)) != 0 && ret == 0)
 		ret = tret;
 
 	return (ret);
diff --git a/src/utilities/util_load.c b/src/utilities/util_load.c
index 14a67c101e4..0d562ebfe6d 100644
--- a/src/utilities/util_load.c
+++ b/src/utilities/util_load.c
@@ -147,7 +147,7 @@ load_dump(WT_SESSION *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, NULL)) != 0) {
+	if ((tret = cursor->close(cursor)) != 0) {
 		tret = util_err(tret, "%s: cursor.close", uri);
 		if (ret == 0)
 			ret = tret;
diff --git a/src/utilities/util_loadtext.c b/src/utilities/util_loadtext.c
index ab284214868..1121a02c31f 100644
--- a/src/utilities/util_loadtext.c
+++ b/src/utilities/util_loadtext.c
@@ -83,7 +83,7 @@ text(WT_SESSION *session, const char *uri)
 	 * 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, NULL)) != 0) {
+	if ((tret = cursor->close(cursor)) != 0) {
 		tret = util_err(tret, "%s: cursor.close", uri);
 		if (ret == 0)
 			ret = tret;
diff --git a/test/format/wts.c b/test/format/wts.c
index b1dd4f197a5..ecb2a517c8e 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -244,8 +244,8 @@ wts_teardown(void)
 	 * Close the open cursors -- they will block sync.
 	 */
 	if ((cursor_insert != NULL &&
-	    (ret = cursor_insert->close(cursor_insert, NULL)) != 0) ||
-	    (cursor != NULL && (ret = cursor->close(cursor, NULL)) != 0))
+	    (ret = cursor_insert->close(cursor_insert)) != 0) ||
+	    (cursor != NULL && (ret = cursor->close(cursor)) != 0))
 		die("cursor.close", ret);
 
 	ret = wts_sync();
@@ -296,7 +296,7 @@ wts_bulk_load(void)
 		}
 	}
 
-err:	(void)cursor->close(cursor, NULL);
+err:	(void)cursor->close(cursor);
 	return (ret);
 }
 
@@ -424,7 +424,7 @@ wts_stats(void)
 
 	if (ret != WT_NOTFOUND)
 		die("cursor.next", ret);
-	if ((ret = cursor->close(cursor, NULL)) != 0)
+	if ((ret = cursor->close(cursor)) != 0)
 		die("cursor.close", ret);
 	
 	/* File statistics. */
@@ -443,7 +443,7 @@ wts_stats(void)
 
 	if (ret != WT_NOTFOUND)
 		die("cursor.next", ret);
-	if ((ret = cursor->close(cursor, NULL)) != 0)
+	if ((ret = cursor->close(cursor)) != 0)
 		die("cursor.close", ret);
 
 	(void)fclose(fp);
diff --git a/test/suite/test_base01.py b/test/suite/test_base01.py
index a7e0d8b99e3..3dbbc8c5527 100644
--- a/test/suite/test_base01.py
+++ b/test/suite/test_base01.py
@@ -77,7 +77,7 @@ class test_base01(wttest.WiredTigerTestCase):
         ret = cursor.search()
         self.assertTrue(ret == wiredtiger.WT_NOTFOUND)
         self.pr('closing cursor')
-        cursor.close(None)
+        cursor.close()
 
     def test_insert(self):
         """
@@ -96,7 +96,7 @@ class test_base01(wttest.WiredTigerTestCase):
         self.assertTrue(ret == 0)
         self.assertTrue(getcursor.get_value(), 'value1')
         self.pr('closing cursor')
-        getcursor.close(None)
+        getcursor.close()
 
 if __name__ == '__main__':
     wttest.run()
diff --git a/test/suite/test_base03.py b/test/suite/test_base03.py
index fa06020b44d..6744e65f4db 100644
--- a/test/suite/test_base03.py
+++ b/test/suite/test_base03.py
@@ -82,7 +82,7 @@ class test_base03(wttest.WiredTigerTestCase):
             i += 1
 
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def test_table_si(self):
         """
@@ -108,7 +108,7 @@ class test_base03(wttest.WiredTigerTestCase):
         self.pr("i = " + str(i))
         self.pr("self.... = " + str(self.nentries))
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def test_table_is(self):
         """
@@ -132,7 +132,7 @@ class test_base03(wttest.WiredTigerTestCase):
             i += 1
 
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def test_table_ii(self):
         """
@@ -158,7 +158,7 @@ class test_base03(wttest.WiredTigerTestCase):
             i += 1
 
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
 
 if __name__ == '__main__':
diff --git a/test/suite/test_base04.py b/test/suite/test_base04.py
index 4c510d7e5ef..b737d32842c 100644
--- a/test/suite/test_base04.py
+++ b/test/suite/test_base04.py
@@ -66,7 +66,7 @@ class test_base04(wttest.WiredTigerTestCase):
 		self.pr('search')
 		self.assertEqual(cursor.search(), expected)
 		self.pr('closing cursor')
-		cursor.close(None)
+		cursor.close()
 
 	def insert(self, key, value):
 		self.pr('insert')
@@ -74,7 +74,7 @@ class test_base04(wttest.WiredTigerTestCase):
 		cursor.set_key(key);
 		cursor.set_value(value)
 		cursor.insert()
-		cursor.close(None)
+		cursor.close()
 		if self.reconcile:
 			self.reopen()
 
@@ -83,7 +83,7 @@ class test_base04(wttest.WiredTigerTestCase):
 		cursor = self.cursor()
 		cursor.set_key(key);
 		cursor.remove()
-		cursor.close(None)
+		cursor.close()
 		if self.reconcile:
 			self.reopen()
 
diff --git a/test/suite/test_base05.py b/test/suite/test_base05.py
index 449621acb78..2fd8ccd4135 100644
--- a/test/suite/test_base05.py
+++ b/test/suite/test_base05.py
@@ -194,7 +194,7 @@ class test_base05(wttest.WiredTigerTestCase):
 
         self.assertEqual(total, self.nentries)
         self.assertEqual(0, len(numbers))
-        cursor.close(None)
+        cursor.close()
 
 if __name__ == '__main__':
     wttest.run()
diff --git a/test/suite/test_compress01.py b/test/suite/test_compress01.py
index f27219d7e50..34e5e0dff76 100644
--- a/test/suite/test_compress01.py
+++ b/test/suite/test_compress01.py
@@ -93,12 +93,12 @@ class test_compress01_base(wttest.WiredTigerTestCase):
             ret = getcursor.search()
             self.assertTrue(ret == 0)
             self.assertEquals(getcursor.get_value(), val)
-            getcursor.close(None)
+            getcursor.close()
 
     def do_fresh_cache(self):
         # Since we are running WT in-process, we just need
         # to shut down the connection and start again.
-        self.conn.close(None)
+        self.conn.close()
         self.conn = self.setUpConnectionOpen(".")
         self.session = self.setUpSessionOpen(self.conn)
 
diff --git a/test/suite/test_config02.py b/test/suite/test_config02.py
index 480294b0522..728adb9c85a 100644
--- a/test/suite/test_config02.py
+++ b/test/suite/test_config02.py
@@ -65,7 +65,7 @@ class test_config02(wttest.WiredTigerTestCase):
             self.assertEqual(value, ('value' + str(i)))
             i += 1
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def checkfiles(self, dirname):
         self.assertTrue(os.path.exists(dirname + os.sep + self.table_name1 + ".wt"))
diff --git a/test/suite/test_config04.py b/test/suite/test_config04.py
index fe1926321ac..d22d7cd75cf 100644
--- a/test/suite/test_config04.py
+++ b/test/suite/test_config04.py
@@ -70,7 +70,7 @@ class test_config04(wttest.WiredTigerTestCase):
             self.assertEqual(value, ('value' + str(i)))
             i += 1
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def common_test(self, configextra):
         """
diff --git a/test/suite/test_config05.py b/test/suite/test_config05.py
index ea3d7616ff2..a34fcb605eb 100644
--- a/test/suite/test_config05.py
+++ b/test/suite/test_config05.py
@@ -49,10 +49,10 @@ class test_config05(wttest.WiredTigerTestCase):
 
     def close_conn(self):
         if self.conn != None:
-            self.conn.close(None)
+            self.conn.close()
             self.conn = None
         if hasattr(self, 'conn2') and self.conn2 != None:
-            self.conn2.close(None)
+            self.conn2.close()
             self.conn2 = None
 
     def populate(self, session):
@@ -66,7 +66,7 @@ class test_config05(wttest.WiredTigerTestCase):
             cursor.set_key(str(1000000 + i))
             cursor.set_value('value' + str(i))
             cursor.insert()
-        cursor.close(None)
+        cursor.close()
 
     def verify_entries(self, session):
         """
@@ -79,7 +79,7 @@ class test_config05(wttest.WiredTigerTestCase):
             self.assertEqual(value, ('value' + str(i)))
             i += 1
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def test_one(self):
         self.conn = wiredtiger.wiredtiger_open('.', 'create')
diff --git a/test/suite/test_cursor01.py b/test/suite/test_cursor01.py
index f75e7104cf8..ccb62750e25 100644
--- a/test/suite/test_cursor01.py
+++ b/test/suite/test_cursor01.py
@@ -148,7 +148,7 @@ class test_cursor01(wttest.WiredTigerTestCase):
 
         self.assertEqual(nextret, wiredtiger.WT_NOTFOUND)
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def test_backward_iter(self):
         """
@@ -200,7 +200,7 @@ class test_cursor01(wttest.WiredTigerTestCase):
 
         self.assertEqual(prevret, wiredtiger.WT_NOTFOUND)
         self.assertEqual(i, -1)
-        cursor.close(None)
+        cursor.close()
 
 if __name__ == '__main__':
     wttest.run()
diff --git a/test/suite/test_cursor02.py b/test/suite/test_cursor02.py
index 64e92aa6470..faeda169690 100644
--- a/test/suite/test_cursor02.py
+++ b/test/suite/test_cursor02.py
@@ -80,7 +80,7 @@ class test_cursor02(TestCursorTracker):
         self.cur_check_forward(cursor, 2)
 
         #self.cur_dump_here(cursor, 'after second next: ')
-        cursor.close(None)
+        cursor.close()
 
     def test_insert_and_remove(self):
         """
@@ -108,7 +108,7 @@ class test_cursor02(TestCursorTracker):
         self.cur_check_forward(cursor, -1)
         self.cur_last(cursor)
         self.cur_check_backward(cursor, -1)
-        cursor.close(None)
+        cursor.close()
 
     def test_iterate_empty(self):
         """
@@ -121,7 +121,7 @@ class test_cursor02(TestCursorTracker):
         self.cur_last(cursor, wiredtiger.WT_NOTFOUND)
         self.cur_check_backward(cursor, -1)
         self.cur_check_forward(cursor, -1)
-        cursor.close(None)
+        cursor.close()
 
     def test_iterate_one_preexisting(self):
         """
@@ -134,7 +134,7 @@ class test_cursor02(TestCursorTracker):
         self.cur_last(cursor)
         self.cur_check_backward(cursor, -1)
         self.cur_check_forward(cursor, -1)
-        cursor.close(None)
+        cursor.close()
 
     def test_iterate_one_added(self):
         """
@@ -149,7 +149,7 @@ class test_cursor02(TestCursorTracker):
         self.cur_last(cursor)
         self.cur_check_backward(cursor, -1)
         self.cur_check_forward(cursor, -1)
-        cursor.close(None)
+        cursor.close()
 
 
 if __name__ == '__main__':
diff --git a/test/suite/test_cursor03.py b/test/suite/test_cursor03.py
index cc86e78c6a5..c956a26f8d9 100644
--- a/test/suite/test_cursor03.py
+++ b/test/suite/test_cursor03.py
@@ -93,7 +93,7 @@ class test_cursor03(TestCursorTracker):
         self.cur_check_here(cursor)
         self.cur_check_forward(cursor, 2)
 
-        cursor.close(None)
+        cursor.close()
 
     def test_insert_and_remove(self):
         """
@@ -121,7 +121,7 @@ class test_cursor03(TestCursorTracker):
         self.cur_check_forward(cursor, -1)
         self.cur_last(cursor)
         self.cur_check_backward(cursor, -1)
-        cursor.close(None)
+        cursor.close()
 
 if __name__ == '__main__':
     wttest.run()
diff --git a/test/suite/test_cursor04.py b/test/suite/test_cursor04.py
index e9ea0eb9037..4b82fa076c8 100644
--- a/test/suite/test_cursor04.py
+++ b/test/suite/test_cursor04.py
@@ -200,7 +200,7 @@ class test_cursor04(wttest.WiredTigerTestCase):
         cursor.set_key(self.genkey(10))
         self.expect_either(cursor, 8, 11)
 
-        cursor.close(None)
+        cursor.close()
 
 if __name__ == '__main__':
     wttest.run()
diff --git a/test/suite/test_cursor_tracker.py b/test/suite/test_cursor_tracker.py
index b0e818aa065..9f77bc76a93 100644
--- a/test/suite/test_cursor_tracker.py
+++ b/test/suite/test_cursor_tracker.py
@@ -103,7 +103,7 @@ class TestCursorTracker(wttest.WiredTigerTestCase):
     def table_dump(self, name):
         cursor = self.session.open_cursor('table:' + name, None, None)
         self._dumpcursor(cursor)
-        cursor.close(None)
+        cursor.close()
 
     def __init__(self, testname):
         wttest.WiredTigerTestCase.__init__(self, testname)
@@ -166,7 +166,7 @@ class TestCursorTracker(wttest.WiredTigerTestCase):
                 cursor.insert()
             cursor.close()
             self.pr('reopening the connection')
-            self.conn.close(None)
+            self.conn.close()
             self.conn = self.setUpConnectionOpen(".")
             self.session = self.setUpSessionOpen(self.conn)
 
diff --git a/test/suite/test_index01.py b/test/suite/test_index01.py
index f5624b24dc0..ff2530c213e 100644
--- a/test/suite/test_index01.py
+++ b/test/suite/test_index01.py
@@ -86,7 +86,7 @@ class test_index01(wttest.WiredTigerTestCase):
         self.pr('search')
         self.assertEqual(cursor.search(), expected)
         self.pr('closing cursor')
-        cursor.close(None)
+        cursor.close()
 
     def insert(self, *cols):
         self.pr('insert')
@@ -94,7 +94,7 @@ class test_index01(wttest.WiredTigerTestCase):
         cursor.set_key(*cols[:2]);
         cursor.set_value(*cols[2:])
         self.assertEqual(cursor.insert(), 0)
-        cursor.close(None)
+        cursor.close()
 
     def insert_overwrite(self, *cols):
         self.pr('insert')
@@ -102,7 +102,7 @@ class test_index01(wttest.WiredTigerTestCase):
         cursor.set_key(*cols[:2]);
         cursor.set_value(*cols[2:])
         self.assertEqual(cursor.insert(), 0)
-        cursor.close(None)
+        cursor.close()
 
     def update(self, *cols):
         self.pr('update')
@@ -110,7 +110,7 @@ class test_index01(wttest.WiredTigerTestCase):
         cursor.set_key(*cols[:2]);
         cursor.set_value(*cols[2:])
         self.assertEqual(cursor.update(), 0)
-        cursor.close(None)
+        cursor.close()
 
     def update_nonexistent(self, *cols):
         self.pr('update')
@@ -118,14 +118,14 @@ class test_index01(wttest.WiredTigerTestCase):
         cursor.set_key(*cols[:2]);
         cursor.set_value(*cols[2:])
         self.assertEqual(cursor.update(), WT_NOTFOUND)
-        cursor.close(None)
+        cursor.close()
 
     def remove(self, name, ID):
         self.pr('remove')
         cursor = self.cursor()
         cursor.set_key(name, ID);
         self.assertEqual(cursor.remove(), 0)
-        cursor.close(None)
+        cursor.close()
 
     def test_empty(self):
         '''Create a table, look for a nonexistent key'''
diff --git a/test/suite/test_priv01.py b/test/suite/test_priv01.py
index ec8bc01a1fa..68e6fa0b0c2 100644
--- a/test/suite/test_priv01.py
+++ b/test/suite/test_priv01.py
@@ -77,7 +77,7 @@ class test_priv01(wttest.WiredTigerTestCase):
             self.assertEqual(value, ('value' + str(i)))
             i += 1
         self.assertEqual(i, self.nentries)
-        cursor.close(None)
+        cursor.close()
 
     def checkfiles(self, dirname):
         self.assertTrue(os.path.exists(dirname + os.sep + self.table_name1 + ".wt"))
diff --git a/test/suite/test_util05.py b/test/suite/test_util05.py
index c457fdc005f..336c54d18b0 100644
--- a/test/suite/test_util05.py
+++ b/test/suite/test_util05.py
@@ -79,7 +79,7 @@ class test_util05(wttest.WiredTigerTestCase, suite_subprocess):
         # we close the connection to guarantee everything is
         # flushed and closed from the WT point of view.
         if self.conn != None:
-            self.conn.close(None)
+            self.conn.close()
             self.conn = None
         filename = tablename + ".wt"
 
diff --git a/test/suite/test_util07.py b/test/suite/test_util07.py
index c81bae2c070..5d5467ba1cc 100644
--- a/test/suite/test_util07.py
+++ b/test/suite/test_util07.py
@@ -59,7 +59,7 @@ class test_util07(wttest.WiredTigerTestCase, suite_subprocess):
         Close the connection if already open.
         """
         if self.conn != None:
-            self.conn.close(None)
+            self.conn.close()
             self.conn = None
 
     def open_conn(self):
diff --git a/test/suite/wttest.py b/test/suite/wttest.py
index 586f628f9d0..1c5f0dabc11 100644
--- a/test/suite/wttest.py
+++ b/test/suite/wttest.py
@@ -101,7 +101,7 @@ class WiredTigerTestCase(unittest.TestCase):
         Close the connection if already open.
         """
         if self.conn != None:
-            self.conn.close(None)
+            self.conn.close()
             self.conn = None
 
     def open_conn(self):
diff --git a/test/thread/stats.c b/test/thread/stats.c
index 108b4bbe2ad..21b4ee1f698 100644
--- a/test/thread/stats.c
+++ b/test/thread/stats.c
@@ -38,7 +38,7 @@ stats(void)
 
 	if (ret != WT_NOTFOUND)
 		die("cursor.next", ret);
-	if ((ret = cursor->close(cursor, NULL)) != 0)
+	if ((ret = cursor->close(cursor)) != 0)
 		die("cursor.close", ret);
 	
 	/* File statistics. */
@@ -52,7 +52,7 @@ stats(void)
 
 	if (ret != WT_NOTFOUND)
 		die("cursor.next", ret);
-	if ((ret = cursor->close(cursor, NULL)) != 0)
+	if ((ret = cursor->close(cursor)) != 0)
 		die("cursor.close", ret);
 
 	if ((ret = session->close(session, NULL)) != 0)