diff options
| -rw-r--r-- | src/block/block_ckpt.c | 4 | ||||
| -rw-r--r-- | src/block/block_ext.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/block/block_ckpt.c b/src/block/block_ckpt.c index 4604b58b477..fa175c9e637 100644 --- a/src/block/block_ckpt.c +++ b/src/block/block_ckpt.c @@ -21,7 +21,7 @@ int __wt_block_ckpt_init( WT_SESSION_IMPL *session, WT_BLOCK_CKPT *ci, const char *name) { - memset(ci, 0, sizeof(*ci)); + WT_CLEAR(*ci); ci->version = WT_BM_CHECKPOINT_VERSION; ci->root_offset = WT_BLOCK_INVALID_OFFSET; @@ -195,7 +195,9 @@ __wt_block_ckpt_destroy(WT_SESSION_IMPL *session, WT_BLOCK_CKPT *ci) __wt_block_extlist_free(session, &ci->alloc); __wt_block_extlist_free(session, &ci->avail); __wt_block_extlist_free(session, &ci->discard); + __wt_block_extlist_free(session, &ci->ckpt_alloc); __wt_block_extlist_free(session, &ci->ckpt_avail); + __wt_block_extlist_free(session, &ci->ckpt_discard); } /* diff --git a/src/block/block_ext.c b/src/block/block_ext.c index 6c40aa8045f..286bdd7e8b8 100644 --- a/src/block/block_ext.c +++ b/src/block/block_ext.c @@ -1311,7 +1311,7 @@ __wt_block_extlist_init(WT_SESSION_IMPL *session, { size_t size; - memset(el, 0, sizeof(*el)); + WT_CLEAR(*el); size = (name == NULL ? 0 : strlen(name)) + strlen(".") + (extname == NULL ? 0 : strlen(extname) + 1); @@ -1346,7 +1346,7 @@ __wt_block_extlist_free(WT_SESSION_IMPL *session, WT_EXTLIST *el) } /* Extent lists are re-used, clear them. */ - memset(el, 0, sizeof(*el)); + WT_CLEAR(*el); } /* |