Rename all metadata functions to start with "__wt_meta".

13 files changed, 54 insertions, 54 deletions

diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c
index 01a6e67f1d9..4b2138491ad 100644
--- a/src/btree/bt_slvg.c
+++ b/src/btree/bt_slvg.c
@@ -303,7 +303,7 @@ __wt_salvage(WT_SESSION_IMPL *session, const char *cfg[])
 			WT_ERR_MSG(session, EINVAL,
 			    "root page eviction failed to create a snapshot");
 		else
-			WT_ERR(__wt_snapshot_list_set(
+			WT_ERR(__wt_meta_snaplist_set(
 			    session, btree->name, snapbase));
 	}
 
diff --git a/src/btree/bt_sync.c b/src/btree/bt_sync.c
index 98eafc19306..797d6e6d798 100644
--- a/src/btree/bt_sync.c
+++ b/src/btree/bt_sync.c
@@ -130,7 +130,7 @@ __snapshot_worker(
 	 * write any dirty pages.
 	 */
 	if ((ret =
-	    __wt_snapshot_list_get(session, btree->name, &snapbase)) != 0) {
+	    __wt_meta_snaplist_get(session, btree->name, &snapbase)) != 0) {
 		if (ret == WT_NOTFOUND) {
 			ret =
 			    __wt_cache_flush(session, WT_SYNC_DISCARD_NOWRITE);
@@ -266,10 +266,9 @@ nomatch:		WT_ERR_MSG(session,
 			WT_ERR_MSG(session,
 			    EINVAL, "cache flush failed to create a snapshot");
 	} else
-		WT_ERR(
-		    __wt_snapshot_list_set(session, btree->name, snapbase));
+		WT_ERR(__wt_meta_snaplist_set(session, btree->name, snapbase));
 
-err:	__wt_snapshot_list_free(session, snapbase);
+err:	__wt_meta_snaplist_free(session, snapbase);
 	__wt_rwunlock(session, btree->snaplock);
 
 	return (ret);
diff --git a/src/btree/bt_vrfy.c b/src/btree/bt_vrfy.c
index 40e97222a2a..e6bee6c1c1f 100644
--- a/src/btree/bt_vrfy.c
+++ b/src/btree/bt_vrfy.c
@@ -96,7 +96,7 @@ __verify_int(WT_SESSION_IMPL *session, int dumpfile)
 	WT_ERR(__wt_scr_alloc(session, 0, &vs->tmp2));
 
 	/* Get a list of the snapshots for this file. */
-	WT_ERR(__wt_snapshot_list_get(session, btree->name, &snapbase));
+	WT_ERR(__wt_meta_snaplist_get(session, btree->name, &snapbase));
 
 	/* Inform the underlying block manager we're verifying. */
 	WT_ERR(__wt_bm_verify_start(session, snapbase));
@@ -138,7 +138,7 @@ __verify_int(WT_SESSION_IMPL *session, int dumpfile)
 	}
 
 	/* Discard the list of snapshots. */
-err:	__wt_snapshot_list_free(session, snapbase);
+err:	__wt_meta_snaplist_free(session, snapbase);
 
 	/* Inform the underlying block manager we're done. */
 	WT_TRET(__wt_bm_verify_end(session));
diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c
index b559797243c..a698f81821d 100644
--- a/src/conn/conn_api.c
+++ b/src/conn/conn_api.c
@@ -831,7 +831,7 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler,
 	 * (which avoids application threads racing to create the metadata file
 	 * later).  We need a session handle for this, open one.
 	 */
-	if ((ret = __wt_turtle_init(session, &exist)) == 0 && !exist)
+	if ((ret = __wt_meta_turtle_init(session, &exist)) == 0 && !exist)
 		ret = __wt_schema_create(session, WT_METADATA_URI, NULL);
 	WT_ERR(ret);
 
diff --git a/src/conn/conn_btree.c b/src/conn/conn_btree.c
index 6bd9a2c94aa..082782b46f9 100644
--- a/src/conn/conn_btree.c
+++ b/src/conn/conn_btree.c
@@ -180,7 +180,7 @@ __wt_conn_btree_open(WT_SESSION_IMPL *session,
 	do {
 		WT_ERR(__wt_scr_alloc(
 		    session, WT_BTREE_MAX_ADDR_COOKIE, &addr));
-		WT_ERR(__wt_snapshot_get(
+		WT_ERR(__wt_meta_snapshot_get(
 		    session, btree->name, btree->snapshot, addr));
 		WT_ERR(__wt_btree_open(session, addr->data, addr->size, cfg,
 		    btree->snapshot == NULL ? 0 : 1));
diff --git a/src/include/extern.h b/src/include/extern.h
index 625c9fa67f3..f57c3b0dfd0 100644
--- a/src/include/extern.h
+++ b/src/include/extern.h
@@ -587,25 +587,26 @@ extern int __wt_log_printf(WT_SESSION_IMPL *session,
     2,
     3)));
 extern WT_LOGREC_DESC __wt_logdesc_debug;
-extern int __wt_file_metadata( WT_SESSION *session,
+extern int __wt_metadata_get(WT_SESSION *session,
     const char *uri,
     const char **valuep);
-extern int __wt_snaplist_get( WT_SESSION *session,
+extern int __wt_metadata_get_snaplist( WT_SESSION *session,
     const char *name,
     WT_SNAPSHOT **snapbasep);
-extern void __wt_snaplist_free(WT_SESSION *session, WT_SNAPSHOT *snapbase);
-extern int __wt_snapshot_get(WT_SESSION_IMPL *session,
+extern void __wt_metadata_free_snaplist(WT_SESSION *session,
+    WT_SNAPSHOT *snapbase);
+extern int __wt_meta_snapshot_get(WT_SESSION_IMPL *session,
     const char *name,
     const char *snapshot,
     WT_ITEM *addr);
-extern int __wt_snapshot_clear(WT_SESSION_IMPL *session, const char *name);
-extern int __wt_snapshot_list_get( WT_SESSION_IMPL *session,
+extern int __wt_meta_snapshot_clear(WT_SESSION_IMPL *session, const char *name);
+extern int __wt_meta_snaplist_get( WT_SESSION_IMPL *session,
     const char *name,
     WT_SNAPSHOT **snapbasep);
-extern int __wt_snapshot_list_set( WT_SESSION_IMPL *session,
+extern int __wt_meta_snaplist_set( WT_SESSION_IMPL *session,
     const char *name,
     WT_SNAPSHOT *snapbase);
-extern void __wt_snapshot_list_free(WT_SESSION_IMPL *session,
+extern void __wt_meta_snaplist_free(WT_SESSION_IMPL *session,
     WT_SNAPSHOT *snapbase);
 extern int __wt_metadata_open(WT_SESSION_IMPL *session);
 extern int __wt_metadata_cursor( WT_SESSION_IMPL *session,
@@ -632,11 +633,11 @@ extern int __wt_meta_track_fileop( WT_SESSION_IMPL *session,
     const char *olduri,
     const char *newuri);
 extern int __wt_meta_track_handle_lock(WT_SESSION_IMPL *session);
-extern int __wt_turtle_init(WT_SESSION_IMPL *session, int *existp);
-extern int __wt_turtle_read(WT_SESSION_IMPL *session,
+extern int __wt_meta_turtle_init(WT_SESSION_IMPL *session, int *existp);
+extern int __wt_meta_turtle_read( WT_SESSION_IMPL *session,
     const char *key,
     const char **valuep);
-extern int __wt_turtle_update( WT_SESSION_IMPL *session,
+extern int __wt_meta_turtle_update( WT_SESSION_IMPL *session,
     const char *key,
     const char *value);
 extern void __wt_abort(WT_SESSION_IMPL *session);
diff --git a/src/meta/meta_api.c b/src/meta/meta_api.c
index f8aca63abbe..74ea9ea91e5 100644
--- a/src/meta/meta_api.c
+++ b/src/meta/meta_api.c
@@ -8,25 +8,24 @@
 #include "wt_internal.h"
 
 /*
- * __wt_file_metadata --
+ * wt_metadata_get --
  *	Public entry point to __wt_metadata_read (for wt dump and list).
  */
 int
-__wt_file_metadata(
-    WT_SESSION *session, const char *uri, const char **valuep)
+__wt_metadata_get(WT_SESSION *session, const char *uri, const char **valuep)
 {
 	return (__wt_metadata_read((WT_SESSION_IMPL *)session, uri, valuep));
 }
 
 /*
  * __wt_snaplist_get --
- *	Public entry point to __wt_snapshot_list_get (for wt list).
+ *	Public entry point to __wt_meta_snaplist_get (for wt list).
  */
 int
-__wt_snaplist_get(
+__wt_metadata_get_snaplist(
     WT_SESSION *session, const char *name, WT_SNAPSHOT **snapbasep)
 {
-	return (__wt_snapshot_list_get(
+	return (__wt_meta_snaplist_get(
 	    (WT_SESSION_IMPL *)session, name, snapbasep));
 }
 
@@ -35,7 +34,7 @@ __wt_snaplist_get(
  *	Public entry point to __wt_snapshot_list_free (for wt list).
  */
 void
-__wt_snaplist_free(WT_SESSION *session, WT_SNAPSHOT *snapbase)
+__wt_metadata_free_snaplist(WT_SESSION *session, WT_SNAPSHOT *snapbase)
 {
-	__wt_snapshot_list_free((WT_SESSION_IMPL *)session, snapbase);
+	__wt_meta_snaplist_free((WT_SESSION_IMPL *)session, snapbase);
 }
diff --git a/src/meta/meta_snapshot.c b/src/meta/meta_snapshot.c
index 94d6a3668c8..60642e7f53c 100644
--- a/src/meta/meta_snapshot.c
+++ b/src/meta/meta_snapshot.c
@@ -16,11 +16,11 @@ static int __snap_set(WT_SESSION_IMPL *, const char *, const char *);
 static int __snap_version_chk(WT_SESSION_IMPL *, const char *, const char *);
 
 /*
- * __wt_snapshot_get --
+ * __wt_meta_snapshot_get --
  *	Get the file's most recent snapshot address.
  */
 int
-__wt_snapshot_get(WT_SESSION_IMPL *session,
+__wt_meta_snapshot_get(WT_SESSION_IMPL *session,
     const char *name, const char *snapshot, WT_ITEM *addr)
 {
 	WT_DECL_RET;
@@ -52,11 +52,11 @@ __wt_snapshot_get(WT_SESSION_IMPL *session,
 }
 
 /*
- * __wt_snapshot_clear --
+ * __wt_meta_snapshot_clear --
  *	Clear a file's snapshot.
  */
 int
-__wt_snapshot_clear(WT_SESSION_IMPL *session, const char *name)
+__wt_meta_snapshot_clear(WT_SESSION_IMPL *session, const char *name)
 {
 	WT_DECL_RET;
 
@@ -200,11 +200,11 @@ __snap_compare_order(const void *a, const void *b)
 }
 
 /*
- * __wt_snapshot_list_get --
+ * __wt_meta_snaplist_get --
  *	Load all available snapshot information for a file.
  */
 int
-__wt_snapshot_list_get(
+__wt_meta_snaplist_get(
     WT_SESSION_IMPL *session, const char *name, WT_SNAPSHOT **snapbasep)
 {
 	WT_CONFIG snapconf;
@@ -293,7 +293,7 @@ __wt_snapshot_list_get(
 
 	if (0) {
 format:		WT_ERR_MSG(session, WT_ERROR, "corrupted snapshot list");
-err:		__wt_snapshot_list_free(session, snapbase);
+err:		__wt_meta_snaplist_free(session, snapbase);
 	}
 	__wt_free(session, config);
 	__wt_scr_free(&buf);
@@ -302,11 +302,11 @@ err:		__wt_snapshot_list_free(session, snapbase);
 }
 
 /*
- * __wt_snapshot_list_set --
+ * __wt_meta_snaplist_set --
  *	Set a file's snapshot value from the WT_SNAPSHOT list.
  */
 int
-__wt_snapshot_list_set(
+__wt_meta_snaplist_set(
     WT_SESSION_IMPL *session, const char *name, WT_SNAPSHOT *snapbase)
 {
 	WT_DECL_RET;
@@ -365,11 +365,11 @@ err:	__wt_scr_free(&buf);
 }
 
 /*
- * __wt_snapshot_list_free --
+ * __wt_meta_snaplist_free --
  *	Discard the snapshot array.
  */
 void
-__wt_snapshot_list_free(WT_SESSION_IMPL *session, WT_SNAPSHOT *snapbase)
+__wt_meta_snaplist_free(WT_SESSION_IMPL *session, WT_SNAPSHOT *snapbase)
 {
 	WT_SNAPSHOT *snap;
 	if (snapbase == NULL)
diff --git a/src/meta/meta_table.c b/src/meta/meta_table.c
index 6876c1796d1..12e608b9e07 100644
--- a/src/meta/meta_table.c
+++ b/src/meta/meta_table.c
@@ -106,7 +106,7 @@ __wt_metadata_update(
 	WT_DECL_RET;
 
 	if (__metadata_turtle(key))
-		return (__wt_turtle_update(session, key, value));
+		return (__wt_meta_turtle_update(session, key, value));
 
 	if (WT_META_TRACKING(session))
 		WT_RET(__wt_meta_track_update(session, key));
@@ -171,7 +171,7 @@ __wt_metadata_read(
 	const char *value;
 
 	if (__metadata_turtle(key))
-		return (__wt_turtle_read(session, key, valuep));
+		return (__wt_meta_turtle_read(session, key, valuep));
 
 	/* Save the caller's btree: the metadata cursor will overwrite it. */
 	btree = session->btree;
diff --git a/src/meta/meta_turtle.c b/src/meta/meta_turtle.c
index f39a0a44cd9..5092c88e19b 100644
--- a/src/meta/meta_turtle.c
+++ b/src/meta/meta_turtle.c
@@ -8,11 +8,11 @@
 #include "wt_internal.h"
 
 /*
- * __wt_turtle_init --
- *	Check on the turtle file.
+ * __wt_meta_turtle_init --
+ *	Check the turtle file and create if necessary.
  */
 int
-__wt_turtle_init(WT_SESSION_IMPL *session, int *existp)
+__wt_meta_turtle_init(WT_SESSION_IMPL *session, int *existp)
 {
 	WT_DECL_RET;
 	WT_ITEM *buf;
@@ -43,7 +43,7 @@ __wt_turtle_init(WT_SESSION_IMPL *session, int *existp)
 	    WT_BTREE_MAJOR_VERSION, WT_BTREE_MINOR_VERSION));
 	cfg[1] = buf->data;
 	WT_RET(__wt_config_collapse(session, cfg, &metaconf));
-	WT_ERR(__wt_turtle_update(session, WT_METADATA_URI, metaconf));
+	WT_ERR(__wt_meta_turtle_update(session, WT_METADATA_URI, metaconf));
 
 err:	__wt_free(session, metaconf);
 	__wt_free(session, path);
@@ -53,11 +53,12 @@ err:	__wt_free(session, metaconf);
 }
 
 /*
- * __wt_turtle_read --
+ * __wt_meta_turtle_read --
  *	Read the turtle file.
  */
 int
-__wt_turtle_read(WT_SESSION_IMPL *session, const char *key, const char **valuep)
+__wt_meta_turtle_read(
+    WT_SESSION_IMPL *session, const char *key, const char **valuep)
 {
 	FILE *fp;
 	WT_DECL_RET;
@@ -109,11 +110,11 @@ err:	if (fp != NULL)
 }
 
 /*
- * __wt_turtle_update --
+ * __wt_meta_turtle_update --
  *	Update the turtle file.
  */
 int
-__wt_turtle_update(
+__wt_meta_turtle_update(
     WT_SESSION_IMPL *session, const char *key,  const char *value)
 {
 	FILE *fp;
diff --git a/src/schema/schema_truncate.c b/src/schema/schema_truncate.c
index a32460cc760..4f712e4b8eb 100644
--- a/src/schema/schema_truncate.c
+++ b/src/schema/schema_truncate.c
@@ -24,7 +24,7 @@ __truncate_file(WT_SESSION_IMPL *session, const char *name)
 	WT_RET(__wt_conn_btree_close_all(session, name));
 
 	/* Delete the root address and truncate the file. */
-	WT_RET(__wt_snapshot_clear(session, name));
+	WT_RET(__wt_meta_snapshot_clear(session, name));
 	WT_RET(__wt_btree_truncate(session, filename));
 
 	return (0);
diff --git a/src/utilities/util_dump.c b/src/utilities/util_dump.c
index c8972733079..39a33072573 100644
--- a/src/utilities/util_dump.c
+++ b/src/utilities/util_dump.c
@@ -303,7 +303,7 @@ dump_file_config(WT_SESSION *session, const char *uri)
 	 * down into the library and ask for the file's configuration,
 	 * that will work in all cases.
 	 */
-	if ((ret = __wt_file_metadata(session, uri, &value)) != 0)
+	if ((ret = __wt_metadata_get(session, uri, &value)) != 0)
 		return (util_err(ret, "metadata read: %s", uri));
 
 	/* Leak the memory, I don't care. */
diff --git a/src/utilities/util_list.c b/src/utilities/util_list.c
index 9556c1001a1..d65c510d11e 100644
--- a/src/utilities/util_list.c
+++ b/src/utilities/util_list.c
@@ -80,7 +80,7 @@ list_print(WT_SESSION *session, const char *name, int sflag, int vflag)
 			return (ret);
 		if (vflag) {
 			if ((ret =
-			    __wt_file_metadata(session, uri, &value)) != 0)
+			    __wt_metadata_get(session, uri, &value)) != 0)
 				return (
 				    util_err(ret, "metadata read: %s", uri));
 			printf("%s\n", value);
@@ -165,7 +165,7 @@ list_print_snapshot(WT_SESSION *session, const char *key)
 	 * report an error, and continue our caller's loop.  Otherwise, report
 	 * each snapshot's name and time.
 	 */
-	if ((ret = __wt_snaplist_get(session, key, &snapbase)) != 0)
+	if ((ret = __wt_metadata_get_snaplist(session, key, &snapbase)) != 0)
 		return (ret == WT_NOTFOUND ? 0 : ret);
 
 	/* Find the longest name, so we can pretty-print. */
@@ -194,7 +194,7 @@ list_print_snapshot(WT_SESSION *session, const char *key)
 			printf(" (%" PRIu64 " B)\n", v);
 	}
 
-	__wt_snaplist_free(session, snapbase);
+	__wt_metadata_free_snaplist(session, snapbase);
 	return (0);
 }