Rename all metadata functions to start with "__wt_meta".

4 files changed, 29 insertions, 29 deletions

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;