WT-2122 Convert more expressions to use bool

Merge pull request #2208 from wiredtiger/more-bool

(cherry picked from commit f1837bf787832c818d226df4c662093d124b01f8)

5 files changed, 17 insertions, 18 deletions

diff --git a/src/block/block_addr.c b/src/block/block_addr.c
index ccee83a7d5d..ff41ccd87f8 100644
--- a/src/block/block_addr.c
+++ b/src/block/block_addr.c
@@ -35,7 +35,7 @@ __block_buffer_to_addr(WT_BLOCK *block,
 	 * can be invalid offsets, that's simpler than testing sizes of 0 all
 	 * over the place.
 	 */
-	if (s == 0) {
+		if (s == 0) {
 		*offsetp = 0;
 		*sizep = *cksump = 0;
 	} else {
diff --git a/src/block/block_compact.c b/src/block/block_compact.c
index 6cd01e17eee..bd5fff17d07 100644
--- a/src/block/block_compact.c
+++ b/src/block/block_compact.c
@@ -49,7 +49,7 @@ __wt_block_compact_end(WT_SESSION_IMPL *session, WT_BLOCK *block)
  *	Return if compaction will shrink the file.
  */
 int
-__wt_block_compact_skip(WT_SESSION_IMPL *session, WT_BLOCK *block, int *skipp)
+__wt_block_compact_skip(WT_SESSION_IMPL *session, WT_BLOCK *block, bool *skipp)
 {
 	WT_DECL_RET;
 	WT_EXT *ext;
@@ -57,7 +57,7 @@ __wt_block_compact_skip(WT_SESSION_IMPL *session, WT_BLOCK *block, int *skipp)
 	WT_FH *fh;
 	wt_off_t avail_eighty, avail_ninety, eighty, ninety;
 
-	*skipp = 1;				/* Return a default skip. */
+	*skipp = true;				/* Return a default skip. */
 
 	fh = block->fh;
 
@@ -119,11 +119,11 @@ __wt_block_compact_skip(WT_SESSION_IMPL *session, WT_BLOCK *block, int *skipp)
 	 */
 	if (avail_eighty > WT_MEGABYTE &&
 	    avail_eighty >= ((fh->size / 10) * 2)) {
-		*skipp = 0;
+		*skipp = false;
 		block->compact_pct_tenths = 2;
 	 } else if (avail_ninety > WT_MEGABYTE &&
 	    avail_ninety >= fh->size / 10) {
-		*skipp = 0;
+		*skipp = false;
 		block->compact_pct_tenths = 1;
 	}
 
@@ -138,7 +138,7 @@ err:	__wt_spin_unlock(session, &block->live_lock);
  */
 int
 __wt_block_compact_page_skip(WT_SESSION_IMPL *session,
-    WT_BLOCK *block, const uint8_t *addr, size_t addr_size, int *skipp)
+    WT_BLOCK *block, const uint8_t *addr, size_t addr_size, bool *skipp)
 {
 	WT_DECL_RET;
 	WT_EXT *ext;
@@ -148,7 +148,7 @@ __wt_block_compact_page_skip(WT_SESSION_IMPL *session,
 	uint32_t size, cksum;
 
 	WT_UNUSED(addr_size);
-	*skipp = 1;				/* Return a default skip. */
+	*skipp = true;				/* Return a default skip. */
 
 	fh = block->fh;
 
@@ -170,7 +170,7 @@ __wt_block_compact_page_skip(WT_SESSION_IMPL *session,
 			if (ext->off >= limit)
 				break;
 			if (ext->size >= size) {
-				*skipp = 0;
+				*skipp = false;
 				break;
 			}
 		}
diff --git a/src/block/block_mgr.c b/src/block/block_mgr.c
index 84d065a0abe..d1875d73bea 100644
--- a/src/block/block_mgr.c
+++ b/src/block/block_mgr.c
@@ -183,7 +183,7 @@ __bm_compact_start(WT_BM *bm, WT_SESSION_IMPL *session)
  */
 static int
 __bm_compact_page_skip(WT_BM *bm, WT_SESSION_IMPL *session,
-    const uint8_t *addr, size_t addr_size, int *skipp)
+    const uint8_t *addr, size_t addr_size, bool *skipp)
 {
 	return (__wt_block_compact_page_skip(
 	    session, bm->block, addr, addr_size, skipp));
@@ -194,7 +194,7 @@ __bm_compact_page_skip(WT_BM *bm, WT_SESSION_IMPL *session,
  *	Return if a file can be compacted.
  */
 static int
-__bm_compact_skip(WT_BM *bm, WT_SESSION_IMPL *session, int *skipp)
+__bm_compact_skip(WT_BM *bm, WT_SESSION_IMPL *session, bool *skipp)
 {
 	return (__wt_block_compact_skip(session, bm->block, skipp));
 }
@@ -350,9 +350,9 @@ __bm_method_set(WT_BM *bm, bool readonly)
 		bm->compact_end =
 		    (int (*)(WT_BM *, WT_SESSION_IMPL *))__bm_readonly;
 		bm->compact_page_skip = (int (*)(WT_BM *, WT_SESSION_IMPL *,
-		    const uint8_t *, size_t, int *))__bm_readonly;
+		    const uint8_t *, size_t, bool *))__bm_readonly;
 		bm->compact_skip = (int (*)
-		    (WT_BM *, WT_SESSION_IMPL *, int *))__bm_readonly;
+		    (WT_BM *, WT_SESSION_IMPL *, bool *))__bm_readonly;
 		bm->compact_start =
 		    (int (*)(WT_BM *, WT_SESSION_IMPL *))__bm_readonly;
 		bm->free = (int (*)(WT_BM *,
diff --git a/src/block/block_open.c b/src/block/block_open.c
index 12c998c7853..4f4b7c57279 100644
--- a/src/block/block_open.c
+++ b/src/block/block_open.c
@@ -213,8 +213,7 @@ __wt_block_open(WT_SESSION_IMPL *session,
 	WT_ERR(__wt_strdup(session, filename, &block->name));
 
 	WT_ERR(__wt_config_gets(session, cfg, "block_allocation", &cval));
-	block->allocfirst =
-	    WT_STRING_MATCH("first", cval.str, cval.len) ? 1 : 0;
+	block->allocfirst = WT_STRING_MATCH("first", cval.str, cval.len);
 
 	/* Configuration: optional OS buffer cache maximum size. */
 	WT_ERR(__wt_config_gets(session, cfg, "os_cache_max", &cval));
diff --git a/src/block/block_vrfy.c b/src/block/block_vrfy.c
index 6231685af38..a945b4b2200 100644
--- a/src/block/block_vrfy.c
+++ b/src/block/block_vrfy.c
@@ -90,7 +90,7 @@ __wt_block_verify_start(WT_SESSION_IMPL *session,
 	 * Set this before reading any extent lists: don't panic if we see
 	 * corruption.
 	 */
-	block->verify = 1;
+	block->verify = true;
 
 	/*
 	 * We maintain an allocation list that is rolled forward through the
@@ -107,7 +107,7 @@ __wt_block_verify_start(WT_SESSION_IMPL *session,
 
 	/* Configuration: strict behavior on any error. */
 	WT_RET(__wt_config_gets(session, cfg, "strict", &cval));
-	block->verify_strict = cval.val ? 1 : 0;
+	block->verify_strict = cval.val != 0;
 	return (0);
 }
 
@@ -174,8 +174,8 @@ __wt_block_verify_end(WT_SESSION_IMPL *session, WT_BLOCK *block)
 	/* Confirm we verified every file block. */
 	ret = __verify_filefrag_chk(session, block);
 
-	block->verify = 0;
-	block->verify_strict = 0;
+	block->verify = false;
+	block->verify_strict = false;
 	block->verify_size = 0;
 
 	/* Discard the accumulated allocation list. */