1 files changed, 24 insertions, 30 deletions

diff --git a/src/third_party/wiredtiger/test/format/bdb.c b/src/third_party/wiredtiger/test/format/bdb.c
index fec23112549..8b61573fdf9 100644
--- a/src/third_party/wiredtiger/test/format/bdb.c
+++ b/src/third_party/wiredtiger/test/format/bdb.c
@@ -1,5 +1,5 @@
 /*-
- * Public Domain 2014-2015 MongoDB, Inc.
+ * Public Domain 2014-2016 MongoDB, Inc.
  * Public Domain 2008-2014 WiredTiger, Inc.
  *
  * This is free and unencumbered software released into the public domain.
@@ -30,7 +30,7 @@
 #include "format.h"
 
 static DBT key, value;
-static uint8_t *keybuf;
+static WT_ITEM keyitem;
 
 static int
 bdb_compare_reverse(DB *dbp, const DBT *k1, const DBT *k2
@@ -78,7 +78,7 @@ bdb_open(void)
 	assert(db->cursor(db, NULL, &dbc, 0) == 0);
 	g.dbc = dbc;
 
-	key_gen_setup(&keybuf);
+	key_gen_setup(&keyitem);
 }
 
 void
@@ -95,8 +95,7 @@ bdb_close(void)
 	assert(db->close(db, 0) == 0);
 	assert(dbenv->close(dbenv, 0) == 0);
 
-	free(keybuf);
-	keybuf = NULL;
+	free(keyitem.mem);
 }
 
 void
@@ -107,9 +106,9 @@ bdb_insert(
 	DBC *dbc;
 
 	key.data = (void *)key_data;
-	key.size = (uint32_t)key_size;
+	key.size = (u_int32_t)key_size;
 	value.data = (void *)value_data;
-	value.size = (uint32_t)value_size;
+	value.size = (u_int32_t)value_size;
 
 	dbc = g.dbc;
 
@@ -128,7 +127,7 @@ bdb_np(int next,
 	if ((ret =
 	    dbc->get(dbc, &key, &value, next ? DB_NEXT : DB_PREV)) != 0) {
 		if (ret != DB_NOTFOUND)
-			die(ret, "dbc.get: %s: {%.*s}",
+			testutil_die(ret, "dbc.get: %s: {%.*s}",
 			    next ? "DB_NEXT" : "DB_PREV",
 			    (int)key.size, (char *)key.data);
 		*notfoundp = 1;
@@ -144,17 +143,16 @@ void
 bdb_read(uint64_t keyno, void *valuep, size_t *valuesizep, int *notfoundp)
 {
 	DBC *dbc = g.dbc;
-	size_t size;
 	int ret;
 
-	key_gen(keybuf, &size, keyno);
-	key.data = keybuf;
-	key.size = (uint32_t)size;
+	key_gen(&keyitem, keyno);
+	key.data = (void *)keyitem.data;
+	key.size = (u_int32_t)keyitem.size;
 
 	*notfoundp = 0;
 	if ((ret = dbc->get(dbc, &key, &value, DB_SET)) != 0) {
 		if (ret != DB_NOTFOUND)
-			die(ret, "dbc.get: DB_SET: {%.*s}",
+			testutil_die(ret, "dbc.get: DB_SET: {%.*s}",
 			    (int)key.size, (char *)key.data);
 		*notfoundp = 1;
 	} else {
@@ -165,25 +163,20 @@ bdb_read(uint64_t keyno, void *valuep, size_t *valuesizep, int *notfoundp)
 
 void
 bdb_update(const void *arg_key, size_t arg_key_size,
-    const void *arg_value, size_t arg_value_size, int *notfoundp)
+    const void *arg_value, size_t arg_value_size)
 {
 	DBC *dbc = g.dbc;
 	int ret;
 
 	key.data = (void *)arg_key;
-	key.size = (uint32_t)arg_key_size;
+	key.size = (u_int32_t)arg_key_size;
 	value.data = (void *)arg_value;
-	value.size = (uint32_t)arg_value_size;
+	value.size = (u_int32_t)arg_value_size;
 
-	*notfoundp = 0;
-	if ((ret = dbc->put(dbc, &key, &value, DB_KEYFIRST)) != 0) {
-		if (ret != DB_NOTFOUND) {
-			die(ret, "dbc.put: DB_KEYFIRST: {%.*s}{%.*s}",
-			    (int)key.size, (char *)key.data,
-			    (int)value.size, (char *)value.data);
-		}
-		*notfoundp = 1;
-	}
+	if ((ret = dbc->put(dbc, &key, &value, DB_KEYFIRST)) != 0)
+		testutil_die(ret, "dbc.put: DB_KEYFIRST: {%.*s}{%.*s}",
+		    (int)key.size, (char *)key.data,
+		    (int)value.size, (char *)value.data);
 }
 
 void
@@ -193,18 +186,19 @@ bdb_remove(uint64_t keyno, int *notfoundp)
 	size_t size;
 	int ret;
 
-	key_gen(keybuf, &size, keyno);
-	key.data = keybuf;
-	key.size = (uint32_t)size;
+	size = 0;
+	key_gen(&keyitem, keyno);
+	key.data = (void *)keyitem.data;
+	key.size = (u_int32_t)keyitem.size;
 
 	bdb_read(keyno, &value.data, &size, notfoundp);
-	value.size = (uint32_t)size;
+	value.size = (u_int32_t)size;
 	if (*notfoundp)
 		return;
 
 	if ((ret = dbc->del(dbc, 0)) != 0) {
 		if (ret != DB_NOTFOUND)
-			die(ret, "dbc.del: {%.*s}",
+			testutil_die(ret, "dbc.del: {%.*s}",
 			    (int)key.size, (char *)key.data);
 		*notfoundp = 1;
 	}