Create a Python pass for source code style checking (to eventually replace s_style).

40 files changed, 218 insertions, 55 deletions

diff --git a/src/block/block_ext.c b/src/block/block_ext.c
index c6f10c1faf3..c4aa8bd02fd 100644
--- a/src/block/block_ext.c
+++ b/src/block/block_ext.c
@@ -907,7 +907,7 @@ __wt_block_extlist_merge(
 }
 
 /*
- * __wt_block_insert_ext, __block_merge --
+ * __wt_block_insert_ext --
  *	Insert an extent into an extent list, merging if possible.
  */
 int
@@ -927,6 +927,12 @@ __wt_block_insert_ext(WT_SESSION_IMPL *session,
 	 */
 	return (__block_merge(session, block, el, off, size));
 }
+
+/*
+ * __block_merge --
+ *	Insert an extent into an extent list, merging if possible (internal
+ *	version).
+ */
 static int
 __block_merge(WT_SESSION_IMPL *session,
     WT_BLOCK *block, WT_EXTLIST *el, off_t off, off_t size)
@@ -1283,6 +1289,10 @@ __wt_block_extlist_free(WT_SESSION_IMPL *session, WT_EXTLIST *el)
 	memset(el, 0, sizeof(*el));
 }
 
+/*
+ * __block_extlist_dump --
+ *	Dump an extent list as verbose messages.
+ */
 static int
 __block_extlist_dump(
     WT_SESSION_IMPL *session, const char *tag, WT_EXTLIST *el, int show_size)
diff --git a/src/block/block_mgr.c b/src/block/block_mgr.c
index 46bc223f70c..59d748ba430 100644
--- a/src/block/block_mgr.c
+++ b/src/block/block_mgr.c
@@ -22,7 +22,7 @@ __bm_readonly(WT_BM *bm, WT_SESSION_IMPL *session)
 }
 
 /*
- * __bm_addr_string
+ * __bm_addr_string --
  *	Return a printable string representation of an address cookie.
  */
 static int
diff --git a/src/btree/bt_handle.c b/src/btree/bt_handle.c
index c1013efb7d6..da5cf95b766 100644
--- a/src/btree/bt_handle.c
+++ b/src/btree/bt_handle.c
@@ -517,7 +517,7 @@ __wt_btree_new_leaf_page(
 }
 
 /*
- * __wt_btree_no_eviction --
+ * __wt_btree_evictable --
  *      Setup or release a cache-resident tree.
  */
 void
@@ -703,6 +703,10 @@ __wt_split_page_size(WT_BTREE *btree, uint32_t maxpagesize)
 	return (split_size);
 }
 
+/*
+ * pse1 --
+ *	Page size error message 1.
+ */
 static int
 pse1(WT_SESSION_IMPL *session, const char *type, uint32_t max, uint32_t ovfl)
 {
@@ -712,6 +716,10 @@ pse1(WT_SESSION_IMPL *session, const char *type, uint32_t max, uint32_t ovfl)
 	    type, max, ovfl);
 }
 
+/*
+ * pse2 --
+ *	Page size error message 2.
+ */
 static int
 pse2(WT_SESSION_IMPL *session,
     const char *type, uint32_t max, uint32_t ovfl, int pct)
diff --git a/src/btree/bt_page.c b/src/btree/bt_page.c
index ab000f5d664..6b141b20fc1 100644
--- a/src/btree/bt_page.c
+++ b/src/btree/bt_page.c
@@ -16,7 +16,7 @@ static int  __inmem_row_leaf_entries(
 	WT_SESSION_IMPL *, WT_PAGE_HEADER *, uint32_t *);
 
 /*
- * __wt_page_in --
+ * __wt_page_in_func --
  *	Acquire a hazard pointer to a page; if the page is not in-memory,
  *	read it from the disk and build an in-memory version.
  */
diff --git a/src/btree/bt_ret.c b/src/btree/bt_ret.c
index 2870a33f49c..a43ff27fa84 100644
--- a/src/btree/bt_ret.c
+++ b/src/btree/bt_ret.c
@@ -8,7 +8,7 @@
 #include "wt_internal.h"
 
 /*
- * __wt_key_get --
+ * __wt_row_key_get --
  *	Get a reference to the current key.
  */
 int
diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c
index 9ab28816046..b6a9354fe31 100644
--- a/src/btree/bt_slvg.c
+++ b/src/btree/bt_slvg.c
@@ -2207,7 +2207,7 @@ __slvg_ovfl_discard(WT_SESSION_IMPL *session, WT_STUFF *ss)
 }
 
 /*
- * __slvg_free --
+ * __slvg_cleanup --
  *	Discard memory allocated to the page and overflow arrays.
  */
 static int
diff --git a/src/btree/bt_walk.c b/src/btree/bt_walk.c
index ff363896414..eb3701717a2 100644
--- a/src/btree/bt_walk.c
+++ b/src/btree/bt_walk.c
@@ -8,7 +8,7 @@
 #include "wt_internal.h"
 
 /*
- * __tree_walk_delete_rollback --
+ * __wt_tree_walk_delete_rollback --
  *	Abort pages that were deleted without being instantiated.
  */
 void
diff --git a/src/btree/rec_evict.c b/src/btree/rec_evict.c
index cba495f30b5..a6c8d462e19 100644
--- a/src/btree/rec_evict.c
+++ b/src/btree/rec_evict.c
@@ -137,7 +137,7 @@ done:	session->excl_next = 0;
 }
 
 /*
- * __rec_root_update  --
+ * __rec_root_update --
  *	Update a root page's reference on eviction (clean or dirty).
  */
 static void
@@ -147,7 +147,7 @@ __rec_root_update(WT_SESSION_IMPL *session)
 }
 
 /*
- * __rec_page_clean_update  --
+ * __rec_page_clean_update --
  *	Update a clean page's reference on eviction.
  */
 static void
diff --git a/src/btree/rec_write.c b/src/btree/rec_write.c
index bc213b523a9..6f3eaf6568a 100644
--- a/src/btree/rec_write.c
+++ b/src/btree/rec_write.c
@@ -541,7 +541,7 @@ __rec_write_init(
 }
 
 /*
- * __rec_destroy --
+ * __wt_rec_destroy --
  *	Clean up the reconciliation structure.
  */
 void
@@ -2072,8 +2072,12 @@ __wt_rec_row_bulk_insert(WT_CURSOR_BULK *cbulk)
 
 #define	WT_FIX_ENTRIES(btree, bytes)	(((bytes) * 8) / (btree)->bitcnt)
 
+/*
+ * __rec_col_fix_bulk_insert_split_check --
+ *	Check if a bulk-loaded fixed-length column store page needs to split.
+ */
 static inline int
-__rec_col_fix_bulk_insert_split_check(WT_CURSOR_BULK  *cbulk)
+__rec_col_fix_bulk_insert_split_check(WT_CURSOR_BULK *cbulk)
 {
 	WT_BTREE *btree;
 	WT_RECONCILE *r;
@@ -3705,7 +3709,7 @@ __rec_split_discard(WT_SESSION_IMPL *session, WT_PAGE *page)
 }
 
 /*
- * __rec_write_wrapup  --
+ * __rec_write_wrapup --
  *	Finish the reconciliation.
  */
 static int
@@ -3951,7 +3955,7 @@ err:			__wt_scr_free(&tkey);
 }
 
 /*
- * __rec_write_wrapup_err  --
+ * __rec_write_wrapup_err --
  *	Finish the reconciliation on error.
  */
 static int
diff --git a/src/btree/row_modify.c b/src/btree/row_modify.c
index 91e2f091c33..8e791fe59f2 100644
--- a/src/btree/row_modify.c
+++ b/src/btree/row_modify.c
@@ -283,7 +283,7 @@ __wt_update_obsolete_free(
 }
 
 /*
- * __wt_page_obsolete --
+ * __wt_row_leaf_obsolete --
  *	Discard all obsolete updates on a row-store leaf page.
  */
 void
diff --git a/src/config/config.c b/src/config/config.c
index 5bfb1646288..acff9c29e28 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -486,7 +486,7 @@ __config_next(WT_CONFIG *conf, WT_CONFIG_ITEM *key, WT_CONFIG_ITEM *value)
 } while (0)
 
 /*
- * __config_process_value
+ * __config_process_value --
  *	Deal with special config values like true / false.
  */
 static int
diff --git a/src/config/config_check.c b/src/config/config_check.c
index 08d65e72d18..d613e3c734e 100644
--- a/src/config/config_check.c
+++ b/src/config/config_check.c
@@ -210,9 +210,9 @@ err:		if (entry != NULL) {
 }
 
 /*
- * __wt_config_check--
+ * __wt_config_check --
  *	Check the keys in an application-supplied config string match what is
- * specified in an array of check strings.
+ *	specified in an array of check strings.
  */
 int
 __wt_config_check(WT_SESSION_IMPL *session,
diff --git a/src/conn/conn_cache_pool.c b/src/conn/conn_cache_pool.c
index e7a9398ef7f..974ce1a402a 100644
--- a/src/conn/conn_cache_pool.c
+++ b/src/conn/conn_cache_pool.c
@@ -363,6 +363,10 @@ err:	__wt_spin_unlock(NULL, &cp->cache_pool_lock);
 	return (ret);
 }
 
+/*
+ * __cache_pool_assess --
+ *	Assess the usage of the cache pool.
+ */
 static int
 __cache_pool_assess(uint64_t *phighest)
 {
@@ -405,9 +409,10 @@ __cache_pool_assess(uint64_t *phighest)
 }
 
 /*
- * Adjust the allocation of cache to each connection. If force is set ignore
- * cache load information, and reduce the allocation for every connection
- * allocated more than their reserved size.
+ * __cache_pool_adjust --
+ *	Adjust the allocation of cache to each connection. If force is set
+ *	ignore cache load information, and reduce the allocation for every
+ *	connection allocated more than their reserved size.
  */
 static int
 __cache_pool_adjust(uint64_t highest, uint64_t bump_threshold)
diff --git a/src/conn/conn_ckpt.c b/src/conn/conn_ckpt.c
index 511904a4565..0706527caf2 100644
--- a/src/conn/conn_ckpt.c
+++ b/src/conn/conn_ckpt.c
@@ -84,7 +84,7 @@ err:		__wt_err(session, ret, "checkpoint server error");
 }
 
 /*
- * __wt_checkpoint_create -
+ * __wt_checkpoint_create --
  *	Start the checkpoint server thread.
  */
 int
@@ -120,7 +120,7 @@ __wt_checkpoint_create(WT_CONNECTION_IMPL *conn, const char *cfg[])
 }
 
 /*
- * __wt_checkpoint_destroy -
+ * __wt_checkpoint_destroy --
  *	Destroy the checkpoint server thread.
  */
 int
diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c
index 9e849e664e9..dc8e1618ccb 100644
--- a/src/cursor/cur_ds.c
+++ b/src/cursor/cur_ds.c
@@ -36,7 +36,7 @@ __curds_txn_leave(WT_SESSION_IMPL *session)
 }
 
 /*
- * __curds_key_set -
+ * __curds_key_set --
  *	Set the key for the data-source.
  */
 static int
@@ -57,7 +57,7 @@ err:	return (ret);
 }
 
 /*
- * __curds_value_set -
+ * __curds_value_set --
  *	Set the value for the data-source.
  */
 static int
@@ -77,7 +77,7 @@ err:	return (ret);
 }
 
 /*
- * __curds_cursor_resolve -
+ * __curds_cursor_resolve --
  *	Resolve cursor operation.
  */
 static int
diff --git a/src/cursor/cur_dump.c b/src/cursor/cur_dump.c
index 7883996f7cb..f89cad2ffd9 100644
--- a/src/cursor/cur_dump.c
+++ b/src/cursor/cur_dump.c
@@ -247,6 +247,10 @@ WT_CURDUMP_PASS(prev)
 WT_CURDUMP_PASS(reset)
 WT_CURDUMP_PASS(search)
 
+/*
+ * __curdump_search_near --
+ *	WT_CURSOR::search_near for dump cursors.
+ */
 static int
 __curdump_search_near(WT_CURSOR *cursor, int *exact)
 {
@@ -260,6 +264,10 @@ WT_CURDUMP_PASS(insert)
 WT_CURDUMP_PASS(update)
 WT_CURDUMP_PASS(remove)
 
+/*
+ * __curdump_close --
+ *	WT_CURSOR::close for dump cursors.
+ */
 static int
 __curdump_close(WT_CURSOR *cursor)
 {
diff --git a/src/cursor/cur_index.c b/src/cursor/cur_index.c
index 34987898ccf..b6b597816a2 100644
--- a/src/cursor/cur_index.c
+++ b/src/cursor/cur_index.c
@@ -303,6 +303,10 @@ err:	API_END(session);
 	return (ret);
 }
 
+/*
+ * __curindex_open_colgroups --
+ *	Open cursors on the column groups required for an index cursor.
+ */
 static int
 __curindex_open_colgroups(
     WT_SESSION_IMPL *session, WT_CURSOR_INDEX *cindex, const char *cfg_arg[])
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index b2575ddebc0..3f85e65b353 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -19,7 +19,7 @@ __wt_cursor_notsup(WT_CURSOR *cursor)
 	return (ENOTSUP);
 }
 
-/* 
+/*
  * __wt_cursor_noop --
  *	Cursor noop.
  */
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index 59015838af7..54b9db2bfd0 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -602,6 +602,10 @@ err:	API_END(session);
 	return (ret);
 }
 
+/*
+ * __curtable_open_colgroups --
+ *	Open cursors on column groups for a table cursor.
+ */
 static int
 __curtable_open_colgroups(WT_CURSOR_TABLE *ctable, const char *cfg_arg[])
 {
@@ -638,6 +642,10 @@ __curtable_open_colgroups(WT_CURSOR_TABLE *ctable, const char *cfg_arg[])
 	return (0);
 }
 
+/*
+ * __curtable_open_indices --
+ *	Open cursors on indices for a table cursor.
+ */
 static int
 __curtable_open_indices(WT_CURSOR_TABLE *ctable)
 {
diff --git a/src/log/log.c b/src/log/log.c
index f6c8dcf9656..de0724112be 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -27,7 +27,7 @@ __wt_log_ckpt(WT_SESSION_IMPL *session, WT_LSN *ckp_lsn)
 }
 
 /*
- * __wt_log_getfiles --
+ * __wt_log_get_files --
  *	Retrieve the list of all existing log files.
  */
 int
@@ -45,8 +45,9 @@ __wt_log_get_files(WT_SESSION_IMPL *session, char ***filesp, u_int *countp)
 }
 
 /*
- * __wt_log_getfiles --
- *	Retrieve the list of all existing log files.
+ * __wt_log_get_active_files --
+ *	Retrieve the list of active log files (those that are not candidates
+ *	for archiving).
  */
 int
 __wt_log_get_active_files(
@@ -257,6 +258,10 @@ __wt_log_close(WT_SESSION_IMPL *session)
 	return (0);
 }
 
+/*
+ * __log_fill --
+ *	Copy a thread's log records into the assigned slot.
+ */
 static int
 __log_fill(WT_SESSION_IMPL *session,
     WT_MYSLOT *myslot, int direct, WT_ITEM *record, WT_LSN *lsnp)
@@ -456,6 +461,10 @@ __log_acquire(WT_SESSION_IMPL *session, uint64_t recsize, WT_LOGSLOT *slot)
 	return (0);
 }
 
+/*
+ * __log_release --
+ *	Release a log slot.
+ */
 static int
 __log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot)
 {
@@ -668,6 +677,10 @@ err:
 	return (ret);
 }
 
+/*
+ * __wt_log_scan --
+ *	Scan the logs, calling a function on each record found.
+ */
 int
 __wt_log_scan(WT_SESSION_IMPL *session, WT_LSN *lsnp, uint32_t flags,
     int (*func)(WT_SESSION_IMPL *session,
@@ -857,7 +870,8 @@ err:	WT_STAT_FAST_CONN_INCR(session, log_scans);
 }
 
 /*
- * Write a log record without using the consolidation arrays.
+ * __log_direct_write --
+ *	Write a log record without using the consolidation arrays.
  */
 static int
 __log_direct_write(WT_SESSION_IMPL *session, WT_ITEM *record, WT_LSN *lsnp,
@@ -893,6 +907,10 @@ err:	if (locked)
 	return (ret);
 }
 
+/*
+ * __wt_log_write --
+ *	Write a record into the log.
+ */
 int
 __wt_log_write(WT_SESSION_IMPL *session, WT_ITEM *record, WT_LSN *lsnp,
     uint32_t flags)
@@ -1014,6 +1032,10 @@ err:
 	return (ret);
 }
 
+/*
+ * __wt_log_vprintf --
+ *	Write a message into the log.
+ */
 int
 __wt_log_vprintf(WT_SESSION_IMPL *session, const char *fmt, va_list ap)
 {
diff --git a/src/log/log_slot.c b/src/log/log_slot.c
index 108f61f7536..f67e74bbbe0 100644
--- a/src/log/log_slot.c
+++ b/src/log/log_slot.c
@@ -227,7 +227,7 @@ __wt_log_slot_wait(WT_LOGSLOT *slot)
 }
 
 /*
- * _wt_log_slot_release --
+ * __wt_log_slot_release --
  *	Each thread in a consolidated group releases its portion to
  *	signal it has completed writing its piece of the log.
  */
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index 27b6f0d873a..8ddd3d84b94 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -33,6 +33,10 @@
 static int __clsm_open_cursors(WT_CURSOR_LSM *, int, u_int, uint32_t);
 static int __clsm_lookup(WT_CURSOR_LSM *);
 
+/*
+ * __clsm_enter --
+ *	Start an operation on an LSM cursor, update if the tree has changed.
+ */
 static inline int
 __clsm_enter(WT_CURSOR_LSM *clsm, int update)
 {
@@ -434,7 +438,8 @@ err:	F_CLR(session, WT_SESSION_NO_CACHE_CHECK);
 	return (ret);
 }
 
-/* __wt_clsm_init_merge --
+/*
+ * __wt_clsm_init_merge --
  *	Initialize an LSM cursor for a merge.
  */
 int
diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c
index f3f08ee4936..acb3f4c315e 100644
--- a/src/lsm/lsm_tree.c
+++ b/src/lsm/lsm_tree.c
@@ -223,7 +223,7 @@ __wt_lsm_tree_setup_chunk(
 }
 
 /*
- * __wt_lsm_start_worker --
+ * __lsm_tree_start_worker --
  *	Start the worker thread for an LSM tree.
  */
 static int
@@ -504,8 +504,8 @@ __wt_lsm_tree_get(WT_SESSION_IMPL *session,
 }
 
 /*
- * __wt_lsm_tree_get --
- *	get an LSM tree structure for the given name.
+ * __wt_lsm_tree_release --
+ *	Release an LSM tree structure.
  */
 void
 __wt_lsm_tree_release(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree)
@@ -515,7 +515,7 @@ __wt_lsm_tree_release(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree)
 }
 
 /*
- * __lsm_tree_throttle --
+ * __wt_lsm_tree_throttle --
  *	Calculate whether LSM updates need to be throttled.
  */
 void
diff --git a/src/meta/meta_track.c b/src/meta/meta_track.c
index 82f7ceded01..3992687f559 100644
--- a/src/meta/meta_track.c
+++ b/src/meta/meta_track.c
@@ -89,6 +89,10 @@ __wt_meta_track_on(WT_SESSION_IMPL *session)
 	return (0);
 }
 
+/*
+ * __meta_track_apply --
+ *	Apply the changes in a metadata tracking record.
+ */
 static int
 __meta_track_apply(WT_SESSION_IMPL *session, WT_META_TRACK *trk, int unroll)
 {
@@ -320,8 +324,8 @@ __wt_meta_track_update(WT_SESSION_IMPL *session, const char *key)
 }
 
 /*
- * __wt_meta_track_fs_rename --
- *	Track a filesystem rename operation.
+ * __wt_meta_track_fileop --
+ *	Track a filesystem operation.
  */
 int
 __wt_meta_track_fileop(
diff --git a/src/os_posix/os_mtx.c b/src/os_posix/os_mtx.c
index bf444db6e36..857cfe6239d 100644
--- a/src/os_posix/os_mtx.c
+++ b/src/os_posix/os_mtx.c
@@ -42,7 +42,7 @@ err:	__wt_free(session, cond);
 }
 
 /*
- * __wt_cond_wait
+ * __wt_cond_wait --
  *	Wait on a mutex, optionally timing out.
  */
 int
@@ -193,7 +193,7 @@ err:		__wt_free(session, rwlock);
 }
 
 /*
- * __wt_readlock
+ * __wt_readlock --
  *	Get a shared lock.
  */
 int
@@ -211,7 +211,7 @@ __wt_readlock(WT_SESSION_IMPL *session, WT_RWLOCK *rwlock)
 }
 
 /*
- * __wt_try_writelock
+ * __wt_try_writelock --
  *	Try to get an exclusive lock, or fail immediately if unavailable.
  */
 int
@@ -230,7 +230,7 @@ __wt_try_writelock(WT_SESSION_IMPL *session, WT_RWLOCK *rwlock)
 }
 
 /*
- * __wt_writelock
+ * __wt_writelock --
  *	Wait to get an exclusive lock.
  */
 int
diff --git a/src/os_posix/os_open.c b/src/os_posix/os_open.c
index dddf9a91485..f6b141c4da2 100644
--- a/src/os_posix/os_open.c
+++ b/src/os_posix/os_open.c
@@ -8,7 +8,7 @@
 #include "wt_internal.h"
 
 /*
- * __open_directory_sync:
+ * __open_directory_sync --
  *	Fsync the directory in which we created the file.
  */
 static int
diff --git a/src/os_posix/os_strtouq.c b/src/os_posix/os_strtouq.c
index cb445261ce5..b532918e241 100644
--- a/src/os_posix/os_strtouq.c
+++ b/src/os_posix/os_strtouq.c
@@ -8,7 +8,8 @@
 #include "wt_internal.h"
 
 /*
- * Convert a string to an unsigned quad integer.
+ * __wt_strtouq --
+ *	Convert a string to an unsigned quad integer.
  */
 uint64_t
 __wt_strtouq(const char *nptr, char **endptr, int base)
diff --git a/src/schema/schema_create.c b/src/schema/schema_create.c
index bd16fb39cc1..fe1ede05393 100644
--- a/src/schema/schema_create.c
+++ b/src/schema/schema_create.c
@@ -46,6 +46,10 @@ __wt_direct_io_size_check(WT_SESSION_IMPL *session,
 	return (0);
 }
 
+/*
+ * __create_file --
+ *	Create a new 'file:' object.
+ */
 static int
 __create_file(WT_SESSION_IMPL *session,
     const char *uri, int exclusive, const char *config)
@@ -122,6 +126,10 @@ err:	__wt_scr_free(&val);
 	return (ret);
 }
 
+/*
+ * __wt_schema_colgroup_source --
+ *	Get the URI of the data source for a column group.
+ */
 int
 __wt_schema_colgroup_source(WT_SESSION_IMPL *session,
     WT_TABLE *table, const char *cgname, const char *config, WT_ITEM *buf)
@@ -154,6 +162,10 @@ __wt_schema_colgroup_source(WT_SESSION_IMPL *session,
 	return (0);
 }
 
+/*
+ * __create_colgroup --
+ *	Create a column group.
+ */
 static int
 __create_colgroup(WT_SESSION_IMPL *session,
     const char *name, int exclusive, const char *config)
@@ -259,6 +271,10 @@ err:	__wt_free(session, cgconf);
 	return (ret);
 }
 
+/*
+ * __wt_schema_index_source --
+ *	Get the URI of the data source for an index.
+ */
 int
 __wt_schema_index_source(WT_SESSION_IMPL *session,
     WT_TABLE *table, const char *idxname, const char *config, WT_ITEM *buf)
@@ -287,6 +303,10 @@ __wt_schema_index_source(WT_SESSION_IMPL *session,
 	return (0);
 }
 
+/*
+ * __create_index --
+ *	Create an index.
+ */
 static int
 __create_index(WT_SESSION_IMPL *session,
     const char *name, int exclusive, const char *config)
@@ -417,6 +437,10 @@ err:	__wt_free(session, idxconf);
 	return (ret);
 }
 
+/*
+ * __create_table --
+ *	Create a table.
+ */
 static int
 __create_table(WT_SESSION_IMPL *session,
     const char *name, int exclusive, const char *config)
@@ -490,6 +514,10 @@ err:		if (table != NULL) {
 	return (ret);
 }
 
+/*
+ * __create_data_source --
+ *	Create a custom data source.
+ */
 static int
 __create_data_source(WT_SESSION_IMPL *session,
     const char *uri, const char *config, WT_DATA_SOURCE *dsrc)
@@ -519,6 +547,10 @@ __create_data_source(WT_SESSION_IMPL *session,
 	return (dsrc->create(dsrc, &session->iface, uri, (WT_CONFIG_ARG *)cfg));
 }
 
+/*
+ * __wt_schema_create --
+ *	Process a WT_SESSION::create operation for all supported types.
+ */
 int
 __wt_schema_create(
     WT_SESSION_IMPL *session, const char *uri, const char *config)
diff --git a/src/schema/schema_drop.c b/src/schema/schema_drop.c
index 91a15f477d6..c4cb864a5de 100644
--- a/src/schema/schema_drop.c
+++ b/src/schema/schema_drop.c
@@ -157,6 +157,10 @@ err:	if (force && ret == WT_NOTFOUND)
 	return (ret);
 }
 
+/*
+ * __wt_schema_drop --
+ *	Process a WT_SESSION::drop operation for all supported types.
+ */
 int
 __wt_schema_drop(WT_SESSION_IMPL *session, const char *uri, const char *cfg[])
 {
diff --git a/src/schema/schema_open.c b/src/schema/schema_open.c
index ad5fee55d16..a63e85a7df9 100644
--- a/src/schema/schema_open.c
+++ b/src/schema/schema_open.c
@@ -109,7 +109,7 @@ err:	__wt_scr_free(&buf);
 }
 
 /*
- * ___open_index --
+ * __open_index --
  *	Open an index.
  */
 static int
@@ -203,8 +203,8 @@ err:	__wt_scr_free(&buf);
 }
 
 /*
- * __wt_schema_open_indices --
- *	Open the indices for a table.
+ * __wt_schema_open_index --
+ *	Open one or more indices for a table.
  */
 int
 __wt_schema_open_index(WT_SESSION_IMPL *session,
diff --git a/src/schema/schema_plan.c b/src/schema/schema_plan.c
index 44b69c0cf9f..aba5fa29715 100644
--- a/src/schema/schema_plan.c
+++ b/src/schema/schema_plan.c
@@ -7,6 +7,10 @@
 
 #include "wt_internal.h"
 
+/*
+ * __find_next_col --
+ *	Find the next column to use for a plan.
+ */
 static int
 __find_next_col(WT_SESSION_IMPL *session, WT_TABLE *table,
     WT_CONFIG_ITEM *colname, u_int *cgnump, u_int *colnump, char *coltype)
@@ -249,6 +253,10 @@ __wt_struct_plan(WT_SESSION_IMPL *session, WT_TABLE *table,
 	return (0);
 }
 
+/*
+ * __find_column_format --
+ *	Find the format of the named column.
+ */
 static int
 __find_column_format(WT_SESSION_IMPL *session,
     WT_TABLE *table, WT_CONFIG_ITEM *colname, int value_only, WT_PACK_VALUE *pv)
diff --git a/src/session/session_dhandle.c b/src/session/session_dhandle.c
index d95a17c66db..d776144d880 100644
--- a/src/session/session_dhandle.c
+++ b/src/session/session_dhandle.c
@@ -211,7 +211,8 @@ retry:			WT_RET(__wt_meta_checkpoint_last_name(
 }
 
 /*
- * Discard any session dhandles that are not open.
+ * __session_dhandle_sweep --
+ *	Discard any session dhandles that are not open.
  */
 static int
 __session_dhandle_sweep(WT_SESSION_IMPL *session)
@@ -235,9 +236,10 @@ __session_dhandle_sweep(WT_SESSION_IMPL *session)
 }
 
 /*
- * Wrapper function to first sweep the session and then get the btree.
- * Sweeping is only called when a session notices it has dead dhandles
- * on its session dhandle list.  Must be called with schema lock.
+ * __session_open_btree --
+ *	Wrapper function to first sweep the session and then get the btree.
+ *	Sweeping is only called when a session notices it has dead dhandles on
+ *	its session dhandle list.  Must be called with schema lock.
  */
 static int
 __session_open_btree(WT_SESSION_IMPL *session,
diff --git a/src/support/global.c b/src/support/global.c
index 807675bddf2..b365b9473eb 100644
--- a/src/support/global.c
+++ b/src/support/global.c
@@ -10,6 +10,10 @@
 WT_PROCESS __wt_process;			/* Per-process structure */
 static int __wt_pthread_once_failed;		/* If initialization failed */
 
+/*
+ * __system_is_little_endian --
+ *	Check if the system is little endian.
+ */
 static int
 __system_is_little_endian(void)
 {
@@ -28,6 +32,10 @@ __system_is_little_endian(void)
 	return (EINVAL);
 }
 
+/*
+ * __wt_pthread_once --
+ *	Global initialization, run once.
+ */
 static void
 __wt_pthread_once(void)
 {
diff --git a/src/support/hash_fnv.c b/src/support/hash_fnv.c
index 111556b62a6..099dba1ec73 100644
--- a/src/support/hash_fnv.c
+++ b/src/support/hash_fnv.c
@@ -109,7 +109,8 @@
 #define	FNV1A_64_INIT ((uint64_t)0xcbf29ce484222325ULL)
 
 /*
- * fnv_64a_buf - perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ * fnv_64a_buf --
+ *	Perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
  *
  * input:
  *	buf	- start of buffer to hash
diff --git a/src/support/hex.c b/src/support/hex.c
index 079260a4eab..3c220ad6ead 100644
--- a/src/support/hex.c
+++ b/src/support/hex.c
@@ -130,6 +130,10 @@ hex2byte(const u_char *from, u_char *to)
 	return (0);
 }
 
+/*
+ * __hex_fmterr --
+ *	Hex format error message.
+ */
 static int
 __hex_fmterr(WT_SESSION_IMPL *session)
 {
diff --git a/src/support/mutex.c b/src/support/mutex.c
index b684fcf0299..8ed8f50322f 100644
--- a/src/support/mutex.c
+++ b/src/support/mutex.c
@@ -66,7 +66,7 @@ __wt_spin_lock_register(WT_SESSION_IMPL *session,
 }
 
 /*
- * __wt_statlog_spinlock_dump --
+ * __wt_statlog_dump_spinlock --
  *	Log the spin-lock statistics.
  */
 int
diff --git a/src/support/pow.c b/src/support/pow.c
index 9ba22a53f8d..c01268245bb 100644
--- a/src/support/pow.c
+++ b/src/support/pow.c
@@ -28,6 +28,7 @@
 #include "wt_internal.h"
 
 #ifdef __WIREDTIGER_UNUSED__
+
 /*
  * __wt_nlpo2_round --
  *	Round up to the next-largest power-of-two for a 32-bit unsigned value.
@@ -63,6 +64,10 @@ __wt_nlpo2_round(uint32_t v)
 	return (v + 1);
 }
 
+/*
+ * __wt_nlpo2 --
+ *	Return the next largest power-of-two.
+ */
 uint32_t
 __wt_nlpo2(uint32_t v)
 {
diff --git a/src/support/scratch.c b/src/support/scratch.c
index db731bf99de..5f4cab931d6 100644
--- a/src/support/scratch.c
+++ b/src/support/scratch.c
@@ -275,7 +275,7 @@ __wt_buf_catfmt(WT_SESSION_IMPL *session, WT_ITEM *buf, const char *fmt, ...)
 }
 
 /*
- * __wt_scr_alloc --
+ * __wt_scr_alloc_func --
  *	Scratch buffer allocation function.
  */
 int
diff --git a/src/txn/txn_log.c b/src/txn/txn_log.c
index 179ea1f8837..17edc48645f 100644
--- a/src/txn/txn_log.c
+++ b/src/txn/txn_log.c
@@ -7,6 +7,10 @@
 
 #include "wt_internal.h"
 
+/*
+ * __txn_op_log --
+ *	Log an operation for the current transaction.
+ */
 static int
 __txn_op_log(WT_SESSION_IMPL *session, WT_ITEM *logrec, WT_TXN_OP *op)
 {
@@ -48,6 +52,10 @@ __txn_op_log(WT_SESSION_IMPL *session, WT_ITEM *logrec, WT_TXN_OP *op)
 	return (0);
 }
 
+/*
+ * __txn_commit_printlog --
+ *	Print a commit log record.
+ */
 static int
 __txn_commit_printlog(
     WT_SESSION_IMPL *session, const uint8_t **pp, const uint8_t *end, FILE *out)
diff --git a/src/txn/txn_recover.c b/src/txn/txn_recover.c
index 5e4c6a41915..f48e83b9b84 100644
--- a/src/txn/txn_recover.c
+++ b/src/txn/txn_recover.c
@@ -26,6 +26,10 @@ typedef struct {
 	int metadata_only;
 } WT_RECOVERY;
 
+/*
+ * __recovery_cursor --
+ *	Get a cursor for a recovery operation.
+ */
 static int
 __recovery_cursor(WT_SESSION_IMPL *session, WT_RECOVERY *r,
     WT_LSN *lsnp, u_int id, int duplicate, WT_CURSOR **cp)
@@ -63,6 +67,10 @@ __recovery_cursor(WT_SESSION_IMPL *session, WT_RECOVERY *r,
 	return (0);
 }
 
+/*
+ * __txn_op_apply --
+ *	Apply a transactional operation during recovery.
+ */
 static int
 __txn_op_apply(
     WT_RECOVERY *r, WT_LSN *lsnp, const uint8_t **pp, const uint8_t *end)
@@ -206,6 +214,10 @@ err:	if (ret != 0)
 	return (ret);
 }
 
+/*
+ * __txn_commit_apply --
+ *	Apply a commit record during recovery.
+ */
 static int
 __txn_commit_apply(
     WT_RECOVERY *r, WT_LSN *lsnp, const uint8_t **pp, const uint8_t *end)
@@ -257,7 +269,7 @@ __txn_log_recover(
 }
 
 /*
- * __recovery_setup_slot --
+ * __recovery_setup_file --
  *	Set up the recovery slot for a file.
  */
 static int