WT-2916 Fix and simplify s_whitespace. (#3047)

13 files changed, 19 insertions, 20 deletions

diff --git a/src/block/block_vrfy.c b/src/block/block_vrfy.c
index 58b62247044..94824ad19f8 100644
--- a/src/block/block_vrfy.c
+++ b/src/block/block_vrfy.c
@@ -352,7 +352,7 @@ __wt_block_verify_addr(WT_SESSION_IMPL *session,
 	WT_RET(
 	    __wt_block_buffer_to_addr(block, addr, &offset, &size, &checksum));
 
-	/* Add to the per-file list. */ 
+	/* Add to the per-file list. */
 	WT_RET(
 	    __verify_filefrag_add(session, block, NULL, offset, size, false));
 
diff --git a/src/btree/bt_cursor.c b/src/btree/bt_cursor.c
index 0fcf05d05fa..3690b41ead4 100644
--- a/src/btree/bt_cursor.c
+++ b/src/btree/bt_cursor.c
@@ -235,7 +235,7 @@ __cursor_col_search(
 {
 	WT_DECL_RET;
 
-	WT_WITH_PAGE_INDEX(session, 
+	WT_WITH_PAGE_INDEX(session,
 	    ret = __wt_col_search(session, cbt->iface.recno, leaf, cbt));
 	return (ret);
 }
@@ -250,7 +250,7 @@ __cursor_row_search(
 {
 	WT_DECL_RET;
 
-	WT_WITH_PAGE_INDEX(session, 
+	WT_WITH_PAGE_INDEX(session,
 	    ret = __wt_row_search(session, &cbt->iface.key, leaf, cbt, insert));
 	return (ret);
 }
diff --git a/src/btree/col_srch.c b/src/btree/col_srch.c
index 6c96181d3bf..64ee9e94f4c 100644
--- a/src/btree/col_srch.c
+++ b/src/btree/col_srch.c
@@ -210,7 +210,7 @@ leaf_only:
 	page = current->page;
 	cbt->ref = current;
 
-	/* 
+	/*
 	 * Don't bother searching if the caller is appending a new record where
 	 * we'll allocate the record number; we're not going to find a match by
 	 * definition, and we figure out the record number and position when we
diff --git a/src/config/config_api.c b/src/config/config_api.c
index 8655057e94d..8820b81a410 100644
--- a/src/config/config_api.c
+++ b/src/config/config_api.c
@@ -113,7 +113,7 @@ wiredtiger_config_validate(WT_SESSION *wt_session,
 
 	session = (WT_SESSION_IMPL *)wt_session;
 
-	/* 
+	/*
 	 * It's a logic error to specify both a session and an event handler.
 	 */
 	if (session != NULL && handler != NULL)
diff --git a/src/config/config_def.c b/src/config/config_def.c
index 0ff2fd379d2..7bad5f12a9f 100644
--- a/src/config/config_def.c
+++ b/src/config/config_def.c
@@ -1323,7 +1323,7 @@ __wt_conn_config_discard(WT_SESSION_IMPL *session)
 	__wt_free(session, conn->config_entries);
 }
 
-/*        
+/*
  * __wt_conn_config_match --
  *      Return the static configuration entry for a method.
  */
diff --git a/src/conn/conn_log.c b/src/conn/conn_log.c
index 53d36cd1c67..2786526c2fa 100644
--- a/src/conn/conn_log.c
+++ b/src/conn/conn_log.c
@@ -925,7 +925,7 @@ __wt_logmgr_open(WT_SESSION_IMPL *session)
 
 	conn = S2C(session);
 
-	/* If no log thread services are configured, we're done. */ 
+	/* If no log thread services are configured, we're done. */
 	if (!FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED))
 		return (0);
 
diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c
index f9b284d7e26..458e0f1b1f0 100644
--- a/src/cursor/cur_ds.c
+++ b/src/cursor/cur_ds.c
@@ -184,12 +184,12 @@ __curds_next(WT_CURSOR *cursor)
 
 	CURSOR_API_CALL(cursor, session, next, NULL);
 
-	WT_STAT_CONN_INCR(session, cursor_next); 
+	WT_STAT_CONN_INCR(session, cursor_next);
 	WT_STAT_DATA_INCR(session, cursor_next);
 
 	WT_ERR(__curds_txn_enter(session));
 
-	F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);         
+	F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
 	ret = __curds_cursor_resolve(cursor, source->next(source));
 
 err:	__curds_txn_leave(session);
@@ -217,7 +217,7 @@ __curds_prev(WT_CURSOR *cursor)
 
 	WT_ERR(__curds_txn_enter(session));
 
-	F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);         
+	F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
 	ret = __curds_cursor_resolve(cursor, source->prev(source));
 
 err:	__curds_txn_leave(session);
@@ -239,7 +239,7 @@ __curds_reset(WT_CURSOR *cursor)
 
 	CURSOR_API_CALL(cursor, session, reset, NULL);
 
-	WT_STAT_CONN_INCR(session, cursor_reset);      
+	WT_STAT_CONN_INCR(session, cursor_reset);
 	WT_STAT_DATA_INCR(session, cursor_reset);
 
 	WT_ERR(source->reset(source));
@@ -323,7 +323,7 @@ __curds_insert(WT_CURSOR *cursor)
 
 	WT_ERR(__curds_txn_enter(session));
 
-	WT_STAT_CONN_INCR(session, cursor_insert);     
+	WT_STAT_CONN_INCR(session, cursor_insert);
 	WT_STAT_DATA_INCR(session, cursor_insert);
 	WT_STAT_DATA_INCRV(session,
 	    cursor_insert_bytes, cursor->key.size + cursor->value.size);
@@ -354,7 +354,7 @@ __curds_update(WT_CURSOR *cursor)
 
 	CURSOR_UPDATE_API_CALL(cursor, session, update, NULL);
 
-	WT_STAT_CONN_INCR(session, cursor_update);     
+	WT_STAT_CONN_INCR(session, cursor_update);
 	WT_STAT_DATA_INCR(session, cursor_update);
 	WT_STAT_DATA_INCRV(session, cursor_update_bytes, cursor->value.size);
 
@@ -385,7 +385,7 @@ __curds_remove(WT_CURSOR *cursor)
 
 	CURSOR_REMOVE_API_CALL(cursor, session, NULL);
 
-	WT_STAT_CONN_INCR(session, cursor_remove);     
+	WT_STAT_CONN_INCR(session, cursor_remove);
 	WT_STAT_DATA_INCR(session, cursor_remove);
 	WT_STAT_DATA_INCRV(session, cursor_remove_bytes, cursor->key.size);
 
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index 3a448818230..caa6b036892 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -566,7 +566,7 @@ statistics will be logged to the file; if the database is configured
 with "all" or "fast", the corresponding statistics will be logged to the
 file.
 
-In previous releases, the WT_SESSION::cursor method took 
+In previous releases, the WT_SESSION::cursor method took
 \c statistics_clear and a \c statistics_fast configurations.  The
 \c statistics_clear configuration defaulted to false; when set to true,
 statistics counters were reset after they were gathered by the cursor.
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
index 843249b695d..35c057c9767 100644
--- a/src/evict/evict_lru.c
+++ b/src/evict/evict_lru.c
@@ -376,7 +376,7 @@ __wt_evict_create(WT_SESSION_IMPL *session)
 	    conn->evict_threads_max, WT_THREAD_CAN_WAIT | WT_THREAD_PANIC_FAIL,
 	    __wt_evict_thread_run));
 
-	/* 
+	/*
 	 * Allow queues to be populated now that the eviction threads
 	 * are running.
 	 */
diff --git a/src/include/txn.i b/src/include/txn.i
index 704964af835..1a8851a9a2a 100644
--- a/src/include/txn.i
+++ b/src/include/txn.i
@@ -21,7 +21,7 @@ __txn_next_op(WT_SESSION_IMPL *session, WT_TXN_OP **opp)
 	txn = &session->txn;
 	*opp = NULL;
 
-	/* 
+	/*
 	 * We're about to perform an update.
 	 * Make sure we have allocated a transaction ID.
 	 */
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index e8e54ada47d..e98f59e7b05 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -668,7 +668,7 @@ retry:	if (F_ISSET(clsm, WT_CLSM_MERGE)) {
 
 	clsm->dsk_gen = lsm_tree->dsk_gen;
 
-err:	
+err:
 #ifdef HAVE_DIAGNOSTIC
 	/* Check that all cursors are open as expected. */
 	if (ret == 0 && F_ISSET(clsm, WT_CLSM_OPEN_READ)) {
diff --git a/src/meta/meta_table.c b/src/meta/meta_table.c
index 58842c756d1..76f4ef0c25f 100644
--- a/src/meta/meta_table.c
+++ b/src/meta/meta_table.c
@@ -54,7 +54,7 @@ __wt_metadata_cursor_open(
 	 */
 	btree = ((WT_CURSOR_BTREE *)(*cursorp))->btree;
 
-	/* 
+	/*
 	 * Special settings for metadata: skew eviction so metadata almost
 	 * always stays in cache and make sure metadata is logged if possible.
 	 *
diff --git a/src/utilities/util_stat.c b/src/utilities/util_stat.c
index e511ca4f7e8..4376f559ceb 100644
--- a/src/utilities/util_stat.c
+++ b/src/utilities/util_stat.c
@@ -70,7 +70,6 @@ util_stat(WT_SESSION *session, int argc, char *argv[])
 	}
 	snprintf(uri, urilen, "statistics:%s", objname);
 
-	
 	if ((ret =
 	    session->open_cursor(session, uri, NULL, config, &cursor)) != 0) {
 		fprintf(stderr, "%s: cursor open(%s) failed: %s\n",