Remove most uses of WT_STORE_SIZE, it was primarily used to convert

size_t types to uint32_t types, during assignment to the WT_ITEM.size
field.

7 files changed, 16 insertions, 16 deletions

diff --git a/src/block/block_ext.c b/src/block/block_ext.c
index f5307eb3397..d7606b83496 100644
--- a/src/block/block_ext.c
+++ b/src/block/block_ext.c
@@ -1136,7 +1136,7 @@ __wt_block_extlist_write(WT_SESSION_IMPL *session,
 
 	dsk->u.datalen =
 	    WT_STORE_SIZE(WT_PTRDIFF32(p, WT_BLOCK_HEADER_BYTE(dsk)));
-	dsk->mem_size = tmp->size = WT_STORE_SIZE(WT_PTRDIFF32(p, dsk));
+	dsk->mem_size = WT_STORE_SIZE(tmp->size = WT_PTRDIFF32(p, dsk));
 
 #ifdef HAVE_DIAGNOSTIC
 	/*
diff --git a/src/btree/bt_misc.c b/src/btree/bt_misc.c
index 27e09fd5b4a..ee4e7897831 100644
--- a/src/btree/bt_misc.c
+++ b/src/btree/bt_misc.c
@@ -94,7 +94,7 @@ __wt_page_addr_string(WT_SESSION_IMPL *session, WT_ITEM *buf, WT_PAGE *page)
 
 	if (WT_PAGE_IS_ROOT(page)) {
 		buf->data = "[Root]";
-		buf->size = WT_STORE_SIZE(strlen("[Root]"));
+		buf->size = strlen("[Root]");
 		return (buf->data);
 	}
 
@@ -118,10 +118,10 @@ __wt_addr_string(
 
 	if (addr == NULL) {
 		buf->data = "[NoAddr]";
-		buf->size = WT_STORE_SIZE(strlen("[NoAddr]"));
+		buf->size = strlen("[NoAddr]");
 	} else if (bm->addr_string(bm, session, buf, addr, size) != 0) {
 		buf->data = "[Error]";
-		buf->size = WT_STORE_SIZE(strlen("[Error]"));
+		buf->size = strlen("[Error]");
 	}
 	return (buf->data);
 }
diff --git a/src/cursor/cur_backup.c b/src/cursor/cur_backup.c
index 96c94748ce2..50c37077c3f 100644
--- a/src/cursor/cur_backup.c
+++ b/src/cursor/cur_backup.c
@@ -40,7 +40,7 @@ __curbackup_next(WT_CURSOR *cursor)
 	}
 
 	cb->iface.key.data = cb->list[cb->next].name;
-	cb->iface.key.size = WT_STORE_SIZE(strlen(cb->list[cb->next].name) + 1);
+	cb->iface.key.size = strlen(cb->list[cb->next].name) + 1;
 	++cb->next;
 
 	F_SET(cursor, WT_CURSTD_KEY_INT);
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index b3aee83ef74..9888fe34d33 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -286,7 +286,7 @@ __wt_cursor_set_keyv(WT_CURSOR *cursor, uint32_t flags, va_list ap)
 		WT_ERR_MSG(session, EINVAL,
 		    "Key size (%" PRIu64 ") out of range", (uint64_t)sz);
 	cursor->saved_err = 0;
-	cursor->key.size = WT_STORE_SIZE(sz);
+	cursor->key.size = sz;
 	F_SET(cursor, WT_CURSTD_KEY_EXT);
 	if (0) {
 err:		cursor->saved_err = ret;
@@ -382,7 +382,7 @@ __wt_cursor_set_value(WT_CURSOR *cursor, ...)
 		    cursor->value_format, ap));
 	}
 	F_SET(cursor, WT_CURSTD_VALUE_EXT);
-	cursor->value.size = WT_STORE_SIZE(sz);
+	cursor->value.size = sz;
 
 	if (0) {
 err:		cursor->saved_err = ret;
diff --git a/src/include/packing.i b/src/include/packing.i
index ab0a6df318a..109ac19d636 100644
--- a/src/include/packing.i
+++ b/src/include/packing.i
@@ -364,7 +364,7 @@ __unpack_read(WT_SESSION_IMPL *session,
 			s = maxlen;
 		WT_SIZE_CHECK(s, maxlen);
 		pv->u.item.data = *pp;
-		pv->u.item.size = WT_STORE_SIZE(s);
+		pv->u.item.size = s;
 		*pp += s;
 		break;
 	case 'b':
diff --git a/src/schema/schema_project.c b/src/schema/schema_project.c
index dac1d0b6e4a..b2f83fc5531 100644
--- a/src/schema/schema_project.c
+++ b/src/schema/schema_project.c
@@ -97,7 +97,7 @@ __wt_schema_project_in(WT_SESSION_IMPL *session,
 					p = (uint8_t *)buf->mem + buf->size;
 					WT_RET(__pack_write(
 					    session, &pv, &p, len));
-					buf->size += WT_STORE_SIZE(len);
+					buf->size += len;
 					end = (uint8_t *)buf->mem + buf->size;
 				} else if (*proj == WT_PROJ_SKIP)
 					WT_RET(__unpack_read(session,
@@ -131,7 +131,7 @@ __wt_schema_project_in(WT_SESSION_IMPL *session,
 					memmove(p + len, p + old_len,
 					    buf->size - (offset + old_len));
 				WT_RET(__pack_write(session, &pv, &p, len));
-				buf->size += WT_STORE_SIZE(len);
+				buf->size += len;
 				break;
 
 			default:
@@ -315,7 +315,7 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session, WT_CURSOR **cp,
 					WT_RET(__pack_write(
 					    session, &pv, &p, len));
 					end = p;
-					buf->size += WT_STORE_SIZE(len);
+					buf->size += len;
 				} else
 					WT_RET(__unpack_read(session,
 					    &pv, (const uint8_t **)&p,
@@ -364,7 +364,7 @@ __wt_schema_project_slice(WT_SESSION_IMPL *session, WT_CURSOR **cp,
 					memmove(p + len, p + old_len,
 					    buf->size - (offset + old_len));
 				WT_RET(__pack_write(session, &pv, &p, len));
-				buf->size += WT_STORE_SIZE(len - old_len);
+				buf->size += len - old_len;
 				end = (uint8_t *)buf->data + buf->size;
 				break;
 			default:
@@ -457,7 +457,7 @@ __wt_schema_project_merge(WT_SESSION_IMPL *session,
 				    value, value->size + len));
 				vp = (uint8_t *)value->mem + value->size;
 				WT_RET(__pack_write(session, &vpv, &vp, len));
-				value->size += WT_STORE_SIZE(len);
+				value->size += len;
 				break;
 			}
 		}
diff --git a/src/support/scratch.c b/src/support/scratch.c
index 8d0e1efcb3d..3126c3e51ac 100644
--- a/src/support/scratch.c
+++ b/src/support/scratch.c
@@ -111,7 +111,7 @@ int
 __wt_buf_initsize(WT_SESSION_IMPL *session, WT_ITEM *buf, size_t size)
 {
 	WT_RET(__wt_buf_init(session, buf, size));
-	buf->size = WT_STORE_SIZE(size);	/* Set the data length. */
+	buf->size = size;			/* Set the data length. */
 
 	return (0);
 }
@@ -218,7 +218,7 @@ __wt_buf_fmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
 		/* Check if there was enough space. */
 		if (len < buf->memsize) {
 			buf->data = buf->mem;
-			buf->size = WT_STORE_SIZE(len);
+			buf->size = len;
 			return (0);
 		}
 
@@ -257,7 +257,7 @@ __wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
 
 		/* Check if there was enough space. */
 		if (len < space) {
-			buf->size += WT_STORE_SIZE(len);
+			buf->size += len;
 			return (0);
 		}