Normalization of H5T

21 files changed, 117 insertions, 190 deletions

diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index e2f3f01..d8dc2fb 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -107,7 +107,7 @@ H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */])
     if (NULL == (dt = H5T__array_create(base, ndims, dim)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to create datatype")
 
-    /* Atomize the type */
+    /* Register the type */
     if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register datatype")
 
@@ -255,13 +255,13 @@ H5T__get_array_ndims(const H5T_t *dt)
  *-------------------------------------------------------------------------
  */
 int
-H5Tget_array_dims2(hid_t type_id, hsize_t dims[])
+H5Tget_array_dims2(hid_t type_id, hsize_t dims[] /*out*/)
 {
     H5T_t *dt;        /* pointer to array data type	*/
     int    ret_value; /* return value			*/
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("Is", "i*h", type_id, dims);
+    H5TRACE2("Is", "ix", type_id, dims);
 
     /* Check args */
     if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
@@ -357,7 +357,7 @@ H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
     if (NULL == (dt = H5T__array_create(base, (unsigned)ndims, dim)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to create datatype")
 
-    /* Atomize the type */
+    /* Register the type */
     if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register datatype")
 
@@ -383,13 +383,13 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int H5_ATTR_UNUSED perm[])
+H5Tget_array_dims1(hid_t type_id, hsize_t dims[] /*out*/, int H5_ATTR_UNUSED perm[] /*out*/)
 {
     H5T_t *dt;        /* Array datatype to query	*/
     int    ret_value; /* return value			*/
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE3("Is", "i*h*Is", type_id, dims, perm);
+    H5TRACE3("Is", "ixx", type_id, dims, perm);
 
     /* Check args */
     if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 87eee18..8dc0582 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -83,8 +83,6 @@ static H5T_t *H5T__reopen_member_type(const H5T_t *dt, unsigned membno);
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 size_t
@@ -151,8 +149,6 @@ H5T_get_member_offset(const H5T_t *dt, unsigned membno)
  * Programmer:	Quincey Koziol
  *		Thursday, November  9, 2000
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5T_class_t
@@ -219,7 +215,7 @@ H5Tget_member_type(hid_t type_id, unsigned membno)
 
     /* Get an ID for the datatype */
     if ((ret_value = H5I_register(H5I_DATATYPE, memb_dt, TRUE)) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable register datatype atom")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable register datatype ID")
 
 done:
     if (ret_value < 0)
@@ -232,7 +228,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5T_get_member_type
  *
- * Purpose:	Returns a copy of the data type of the specified member.
+ * Purpose:     Returns a copy of the data type of the specified member.
  *
  * Return:	Success:	A copy of the member datatype;
  *				modifying the returned datatype does not
@@ -344,8 +340,6 @@ H5T__get_member_size(const H5T_t *dt, unsigned membno)
  * Programmer:	Robb Matzke
  *		Monday, December  8, 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -390,8 +384,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -572,7 +564,7 @@ H5T__pack(const H5T_t *dt)
             for (i = 0, offset = 0; i < dt->shared->u.compnd.nmembs; i++) {
                 dt->shared->u.compnd.memb[i].offset = offset;
                 offset += dt->shared->u.compnd.memb[i].size;
-            } /* end for */
+            }
 
             /* Change total size */
             dt->shared->size = MAX(1, offset);
@@ -597,8 +589,6 @@ done:
  * Programmer:	Quincey Koziol
  *		Thursday, September 11, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static htri_t
@@ -634,8 +624,6 @@ H5T__is_packed(const H5T_t *dt)
  * Programmer:	Neil Fortner
  *		Monday, October 19, 2009
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 4e1c16f..a33a67c 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -9529,14 +9529,14 @@ H5T_reclaim_cb(void *elem, const H5T_t *dt, unsigned H5_ATTR_UNUSED ndim, const
     HDassert(dt);
 
     if (dt->shared->type == H5T_REFERENCE) {
-        if (H5T_ref_reclaim(elem, dt) < 0)
+        if (H5T__ref_reclaim(elem, dt) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "can't reclaim ref elements")
     }
     else {
         HDassert(op_data);
 
         /* Allow vlen reclaim to recurse into that routine */
-        if (H5T_vlen_reclaim(elem, dt, (H5T_vlen_alloc_info_t *)op_data) < 0)
+        if (H5T__vlen_reclaim(elem, dt, (H5T_vlen_alloc_info_t *)op_data) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "can't reclaim vlen elements")
     }
 
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index c88f643..dd145c9 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -37,10 +37,6 @@
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived data types.
- *
  *-------------------------------------------------------------------------
  */
 H5T_cset_t
@@ -83,10 +79,6 @@ done:
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works with derived data types.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c
index a3c300d..277c9a2 100644
--- a/src/H5Tdeprec.c
+++ b/src/H5Tdeprec.c
@@ -15,7 +15,7 @@
  *
  * Created:	H5Tdeprec.c
  *		April 5 2007
- *		Quincey Koziol <koziol@hdfgroup.org>
+ *		Quincey Koziol
  *
  * Purpose:	Deprecated functions from the H5T interface.  These
  *              functions are here for compatibility purposes and may be
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index b58ad30..72705f2 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -25,8 +25,8 @@
 #include "H5Tpkg.h"      /*data-type functions			  */
 
 /* Static local functions */
-static char * H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size);
-static herr_t H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/);
+static char * H5T__enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size);
+static herr_t H5T__enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/);
 
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_create
@@ -62,9 +62,9 @@ H5Tenum_create(hid_t parent_id)
     if (NULL == (dt = H5T__enum_create(parent)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, H5I_INVALID_HID, "cannot create enum type")
 
-    /* Atomize the type */
+    /* Register the type */
     if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register data type atom")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register data type ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -84,8 +84,6 @@ done:
  * Programmer:	Raymond Lu
  *              October 9, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5T_t *
@@ -126,8 +124,6 @@ done:
  * Programmer:	Robb Matzke
  *              Wednesday, December 23, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -172,8 +168,6 @@ done:
  * Programmer:	Robb Matzke
  *              Wednesday, December 23, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -195,7 +189,7 @@ H5T__enum_insert(const H5T_t *dt, const char *name, const void *value)
         if (!HDmemcmp((uint8_t *)dt->shared->u.enumer.value + (i * dt->shared->size), value,
                       dt->shared->size))
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "value redefinition")
-    } /* end for */
+    }
 
     /* Increase table sizes */
     if (dt->shared->u.enumer.nmembs >= dt->shared->u.enumer.nalloc) {
@@ -211,7 +205,7 @@ H5T__enum_insert(const H5T_t *dt, const char *name, const void *value)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
         dt->shared->u.enumer.value  = values;
         dt->shared->u.enumer.nalloc = n;
-    } /* end for */
+    }
 
     /* Insert new member at end of member arrays */
     dt->shared->u.enumer.sorted  = H5T_SORT_NONE;
@@ -236,8 +230,6 @@ done:
  * Programmer:	Robb Matzke
  *              Wednesday, December 23, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -278,8 +270,6 @@ done:
  * Programmer:	Raymond Lu
  *              October 9, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -313,8 +303,6 @@ H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value /*out*/)
  * Programmer:	Robb Matzke
  *              Monday, January  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -336,7 +324,7 @@ H5Tenum_nameof(hid_t type, const void *value, char *name /*out*/, size_t size)
     if (!name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name buffer supplied")
 
-    if (NULL == H5T_enum_nameof(dt, value, name, size))
+    if (NULL == H5T__enum_nameof(dt, value, name, size))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "nameof query failed")
 
 done:
@@ -344,7 +332,7 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5T_enum_nameof
+ * Function:	H5T__enum_nameof
  *
  * Purpose:	Finds the symbol name that corresponds the the specified
  *		VALUE of an enumeration data type DT. At most SIZE characters
@@ -364,15 +352,10 @@ done:
  * Programmer:	Robb Matzke
  *              Monday, January  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              Wednesday, Febuary 9, 2005
- *              Made a copy of original datatype and do sorting and search
- *              on that copy, to protect the original order of members.
  *-------------------------------------------------------------------------
  */
 static char *
-H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size)
+H5T__enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size)
 {
     H5T_t *  copied_dt = NULL;   /* Do sorting in copied datatype */
     unsigned lt, md = 0, rt;     /* Indices for binary search	*/
@@ -380,7 +363,7 @@ H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t s
     hbool_t  alloc_name = FALSE; /* Whether name has been allocated */
     char *   ret_value  = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Check args */
     HDassert(dt && H5T_ENUM == dt->shared->type);
@@ -440,7 +423,7 @@ done:
         H5MM_free(name);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_enum_nameof() */
+} /* end H5T__enum_nameof() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Tenum_valueof
@@ -457,11 +440,6 @@ done:
  * Programmer:	Robb Matzke
  *              Monday, January  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              Wednesday, Febuary 9, 2005
- *              Made a copy of original datatype and do sorting and search
- *              on that copy, to protect the original order of members.
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -483,7 +461,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value /*out*/)
     if (!value)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no value buffer")
 
-    if (H5T_enum_valueof(dt, name, value) < 0)
+    if (H5T__enum_valueof(dt, name, value) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "valueof query failed")
 
 done:
@@ -491,7 +469,7 @@ done:
 } /* H5Tenum_valueof() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5T_enum_valueof
+ * Function:	H5T__enum_valueof
  *
  * Purpose:	Finds the value that corresponds the the specified symbol
  *		NAME of an enumeration data type DT and copy it to the VALUE
@@ -505,22 +483,17 @@ done:
  * Programmer:	Robb Matzke
  *              Monday, January  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              Wednesday, Febuary 9, 2005
- *              Made a copy of original datatype and do sorting and search
- *              on that copy, to protect the original order of members.
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/)
+H5T__enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/)
 {
     unsigned lt, md = 0, rt;      /*indices for binary search	*/
     int      cmp       = (-1);    /*comparison result		*/
     H5T_t *  copied_dt = NULL;    /*do sorting in copied datatype */
     herr_t   ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Check args */
     HDassert(dt && H5T_ENUM == dt->shared->type);
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index fc7cde8..baeae6d 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -39,9 +39,6 @@
  * Programmer:	Robb Matzke
  *		Monday, December  8, 1997
  *
- * Modifications:
- *	Robb Matzke, 22 Dec 1998
- *	Also works with enumeration datatypes.
  *-------------------------------------------------------------------------
  */
 int
@@ -80,8 +77,6 @@ done:
  * Programmer:  Raymond Lu
  *	        October 8, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -120,9 +115,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *	Robb Matzke, 22 Dec 1998
- *	Also works with enumeration datatypes.
  *-------------------------------------------------------------------------
  */
 char *
@@ -161,7 +153,6 @@ done:
  * Programmer:	Raymond Lu
  *              October 9, 2002
  *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 char *
@@ -219,8 +210,6 @@ done:
  * Programmer:  Raymond Lu
  *              Thursday, April 4, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -389,8 +378,6 @@ H5T__sort_value(const H5T_t *dt, int *map)
  * Programmer:	Robb Matzke
  *              Monday, January  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c
index 3ff43a6..9527a5a 100644
--- a/src/H5Tfixed.c
+++ b/src/H5Tfixed.c
@@ -35,9 +35,6 @@
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- *	Robb Matzke, 22 Dec 1998
- *	Also works with derived datatypes.
  *-------------------------------------------------------------------------
  */
 H5T_sign_t
@@ -72,8 +69,6 @@ done:
  * Programmer:	Raymond Lu
  *		October 8, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5T_sign_t
@@ -110,10 +105,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works with derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c
index be49936..b3fa724 100644
--- a/src/H5Tfloat.c
+++ b/src/H5Tfloat.c
@@ -187,10 +187,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works with derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index b1f0581..2688b23 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -18,13 +18,13 @@
 
 #include "H5Tmodule.h" /* This source code file is part of the H5T module */
 
-#include "H5private.h"   /* Generic Functions			*/
+#include "H5private.h"   /* Generic Functions            */
 #include "H5CXprivate.h" /* API Contexts                         */
-#include "H5Eprivate.h"  /* Error handling		  	*/
-#include "H5Iprivate.h"  /* IDs			  		*/
-#include "H5Pprivate.h"  /* Property lists			*/
-#include "H5MMprivate.h" /* Memory management			*/
-#include "H5Tpkg.h"      /* Datatypes				*/
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5Pprivate.h"  /* Property lists            */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Tpkg.h"      /* Datatypes                */
 
 /* Static local functions */
 static H5T_t *H5T__get_native_type(H5T_t *dt, H5T_direction_t direction, size_t *struct_align, size_t *offset,
@@ -338,7 +338,7 @@ H5T__get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_ali
         break;
 
         case H5T_ENUM: {
-            H5T_path_t *tpath; /* Type conversion info	*/
+            H5T_path_t *tpath; /* Type conversion info    */
             hid_t       super_type_id, nat_super_type_id;
 
             /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer.
@@ -922,18 +922,18 @@ done:
 H5_GCC_DIAG_ON("duplicated-branches")
 
 /*-------------------------------------------------------------------------
- * Function:	H5T__cmp_offset
+ * Function:    H5T__cmp_offset
  *
- * Purpose:	This function is only for convenience.  It computes the
+ * Purpose:    This function is only for convenience.  It computes the
  *              compound type size, offset of the member being considered
  *              and the alignment for the whole compound type.
  *
- * Return:	Success:        Non-negative value.
+ * Return:    Success:        Non-negative value.
  *
- *		Failure:        Negative value.
+ *            Failure:        Negative value.
  *
- * Programmer:	Raymond Lu
- *		December  10, 2002
+ * Programmer:    Raymond Lu
+ *        December  10, 2002
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index baa9d69..b206dca 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -24,7 +24,7 @@
 #include "H5Tpkg.h"     /* Datatypes				*/
 
 /* Static local functions */
-static herr_t H5T_set_offset(const H5T_t *dt, size_t offset);
+static herr_t H5T__set_offset(const H5T_t *dt, size_t offset);
 
 /*-------------------------------------------------------------------------
  * Function:	H5Tget_offset
@@ -158,10 +158,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Moved real work to a private function.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -187,7 +183,7 @@ H5Tset_offset(hid_t type_id, size_t offset)
         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
 
     /* Do the real work */
-    if (H5T_set_offset(dt, offset) < 0)
+    if (H5T__set_offset(dt, offset) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
 
 done:
@@ -195,7 +191,7 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5T_set_offset
+ * Function:	H5T__set_offset
  *
  * Purpose:	Sets the bit offset of the first significant bit.  The
  *		significant bits of an atomic datum can be offset from the
@@ -227,18 +223,14 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived data types.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_set_offset(const H5T_t *dt, size_t offset)
+H5T__set_offset(const H5T_t *dt, size_t offset)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_STATIC
 
     /* Check args */
     HDassert(dt);
@@ -249,7 +241,7 @@ H5T_set_offset(const H5T_t *dt, size_t offset)
     HDassert(!(H5T_ENUM == dt->shared->type && 0 == dt->shared->u.enumer.nmembs));
 
     if (dt->shared->parent) {
-        if (H5T_set_offset(dt->shared->parent, offset) < 0)
+        if (H5T__set_offset(dt->shared->parent, offset) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
 
         /* Adjust size of datatype appropriately */
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 16e38d6..f097fca 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -34,8 +34,6 @@
  * Programmer:	Robb Matzke
  *		Thursday, May 20, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -80,8 +78,6 @@ done:
  * Programmer:	Robb Matzke
  *		Thursday, May 20, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 char *
diff --git a/src/H5Torder.c b/src/H5Torder.c
index d28bd9e..e0b48b3 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -45,7 +45,7 @@
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5T_set_order(H5T_t *dtype, H5T_order_t order);
+static herr_t H5T__set_order(H5T_t *dtype, H5T_order_t order);
 
 /*********************/
 /* Public Variables */
@@ -204,7 +204,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype is read-only")
 
     /* Call internal routine to set the order */
-    if (H5T_set_order(dt, order) < 0)
+    if (H5T__set_order(dt, order) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't set order")
 
 done:
@@ -212,7 +212,7 @@ done:
 } /* end H5Tset_order() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5T_set_order
+ * Function:	H5T__set_order
  *
  * Purpose:	Private function to set the byte order for a datatype.
  *
@@ -224,11 +224,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_set_order(H5T_t *dtype, H5T_order_t order)
+H5T__set_order(H5T_t *dtype, H5T_order_t order)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_STATIC
 
     if (H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
@@ -262,11 +262,11 @@ H5T_set_order(H5T_t *dtype, H5T_order_t order)
 
             /* Loop through all fields of compound type, setting the order */
             for (i = 0; i < nmemb; i++)
-                if (H5T_set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
+                if (H5T__set_order(dtype->shared->u.compnd.memb[i].type, order) < 0)
                     HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set order for compound member")
         } /* end if */
     }     /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_set_order() */
+} /* end H5T__set_order() */
diff --git a/src/H5Tpad.c b/src/H5Tpad.c
index 5eaf99c..db1a2cb 100644
--- a/src/H5Tpad.c
+++ b/src/H5Tpad.c
@@ -35,10 +35,6 @@
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works with derived data types.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -78,10 +74,6 @@ done:
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- *	Robb Matzke, 22 Dec 1998
- *	Also works with derived data types.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index d88a379..220adb3b2 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -858,6 +858,7 @@ H5_DLL void     H5T__bit_neg(uint8_t *buf, size_t start, size_t size);
 
 /* VL functions */
 H5_DLL H5T_t *H5T__vlen_create(const H5T_t *base);
+H5_DLL herr_t H5T__vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info);
 H5_DLL htri_t H5T__vlen_set_loc(const H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc);
 
 /* Array functions */
@@ -866,6 +867,7 @@ H5_DLL int    H5T__get_array_ndims(const H5T_t *dt);
 H5_DLL int    H5T__get_array_dims(const H5T_t *dt, hsize_t dims[]);
 
 /* Reference functions */
+H5_DLL herr_t H5T__ref_reclaim(void *elem, const H5T_t *dt);
 H5_DLL htri_t H5T__ref_set_loc(const H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc);
 
 /* Compound functions */
diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c
index 69ccb84..f992141 100644
--- a/src/H5Tprecis.c
+++ b/src/H5Tprecis.c
@@ -42,10 +42,6 @@ static herr_t H5T_set_precision(const H5T_t *dt, size_t prec);
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 size_t
@@ -129,10 +125,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Moved real work to a private function.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -191,10 +183,6 @@ done:
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index ecec597..e1d0f88 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -24,7 +24,7 @@ typedef struct H5T_t H5T_t;
 #include "H5Tpublic.h"
 
 /* Other public headers needed by this file */
-#include "H5MMpublic.h" /* Memory management                    */
+#include "H5MMpublic.h" /* Memory management                        */
 
 /* Private headers needed by this file */
 #include "H5private.h"   /* Generic Functions                        */
@@ -135,8 +135,6 @@ H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t
                           size_t bkg_stride, void *buf, void *bkg);
 H5_DLL herr_t H5T_reclaim(hid_t type_id, struct H5S_t *space, void *buf);
 H5_DLL herr_t H5T_reclaim_cb(void *elem, const H5T_t *dt, unsigned ndim, const hsize_t *point, void *op_data);
-H5_DLL herr_t H5T_ref_reclaim(void *elem, const H5T_t *dt);
-H5_DLL herr_t H5T_vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info);
 H5_DLL herr_t H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt);
 H5_DLL htri_t H5T_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc);
 H5_DLL htri_t H5T_is_sensible(const H5T_t *dt);
diff --git a/src/H5Tref.c b/src/H5Tref.c
index 213176c..98389e8 100644
--- a/src/H5Tref.c
+++ b/src/H5Tref.c
@@ -40,6 +40,22 @@
 #define H5T_REF_OBJ_DISK_SIZE(f)     (H5F_SIZEOF_ADDR(f))
 #define H5T_REF_DSETREG_DISK_SIZE(f) (H5HG_HEAP_ID_SIZE(f))
 
+/* Debug */
+// #define H5T_REF_DEBUG
+#ifdef H5T_REF_DEBUG
+#define H5T_REF_LOG_DEBUG(...)                                                                               \
+    do {                                                                                                     \
+        HDfprintf(stdout, " # %s(): ", __func__);                                                            \
+        HDfprintf(stdout, __VA_ARGS__);                                                                      \
+        HDfprintf(stdout, "\n");                                                                             \
+        HDfflush(stdout);                                                                                    \
+    } while (0)
+#else
+#define H5T_REF_LOG_DEBUG(...)                                                                               \
+    do {                                                                                                     \
+    } while (0)
+#endif
+
 /******************/
 /* Local Typedefs */
 /******************/
@@ -145,6 +161,7 @@ H5T__ref_set_loc(const H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
     htri_t ret_value = FALSE; /* Indicate success, but no location change */
 
     FUNC_ENTER_PACKAGE
+    H5T_REF_LOG_DEBUG("loc=%d", (int)loc);
 
     HDassert(dt);
     /* f is NULL when loc == H5T_LOC_MEMORY */
@@ -331,6 +348,7 @@ H5T__ref_mem_isnull(const H5VL_object_t H5_ATTR_UNUSED *src_file, const void *sr
     herr_t              ret_value               = SUCCEED;
 
     FUNC_ENTER_STATIC_NOERR
+    H5T_REF_LOG_DEBUG("");
 
     /* Check parameters */
     HDassert(src_buf);
@@ -356,6 +374,7 @@ H5T__ref_mem_setnull(H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, H5_A
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC_NOERR
+    H5T_REF_LOG_DEBUG("");
 
     HDmemset(dst_buf, 0, H5T_REF_MEM_SIZE);
 
@@ -383,6 +402,7 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
     size_t   ret_value = 0; /* Return value */
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Sanity check */
     HDassert(src_buf);
@@ -483,6 +503,7 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
     herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Sanity check */
     HDassert(src_buf);
@@ -492,7 +513,7 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
     /* Memory-to-memory conversion to support vlen conversion */
     if (NULL == dst_file) {
-        HDmemcpy(dst_buf, src_buf, dst_size);
+        H5MM_memcpy(dst_buf, src_buf, dst_size);
         HGOTO_DONE(ret_value);
     }
 
@@ -565,22 +586,25 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
                    H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t dst_size,
                    void H5_ATTR_UNUSED *bg_buf)
 {
-    H5F_t *         src_f     = NULL;
-    hid_t           file_id   = H5I_INVALID_HID;
-    H5R_ref_priv_t *dst_ref   = (H5R_ref_priv_t *)dst_buf;
+    H5F_t *         src_f   = NULL;
+    hid_t           file_id = H5I_INVALID_HID;
+    H5R_ref_priv_t *dst_ref = (H5R_ref_priv_t *)dst_buf;
+    H5R_ref_priv_t  tmp_ref; /* Temporary reference to decode into */
     herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Sanity check */
     HDassert(src_buf);
     HDassert(src_size);
     HDassert(dst_buf);
     HDassert(dst_size == H5T_REF_MEM_SIZE);
+    HDcompile_assert(sizeof(*dst_ref) == sizeof(tmp_ref));
 
     /* Memory-to-memory conversion to support vlen conversion */
     if (NULL == src_file) {
-        HDmemcpy(dst_buf, src_buf, src_size);
+        H5MM_memcpy(dst_buf, src_buf, src_size);
         HGOTO_DONE(ret_value);
     }
 
@@ -602,13 +626,13 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
 
     /* Make sure reference buffer is correctly initialized */
-    HDmemset(dst_buf, 0, dst_size);
+    HDmemset(&tmp_ref, 0, sizeof(tmp_ref));
 
     switch (src_type) {
         case H5R_OBJECT1: {
             size_t token_size = H5F_SIZEOF_ADDR(src_f);
 
-            if (H5R__create_object((const H5O_token_t *)src_buf, token_size, dst_ref) < 0)
+            if (H5R__create_object((const H5O_token_t *)src_buf, token_size, &tmp_ref) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create object reference")
         } break;
 
@@ -616,7 +640,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
             const struct H5Tref_dsetreg *src_reg    = (const struct H5Tref_dsetreg *)src_buf;
             size_t                       token_size = H5F_SIZEOF_ADDR(src_f);
 
-            if (H5R__create_region(&src_reg->token, token_size, src_reg->space, dst_ref) < 0)
+            if (H5R__create_region(&src_reg->token, token_size, src_reg->space, &tmp_ref) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create region reference")
 
             /* create_region creates its internal copy of the space */
@@ -628,11 +652,12 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
             /* Pass the correct encoding version for the selection depending on the
              * file libver bounds, this is later retrieved in H5S hyper decode */
             H5CX_set_libver_bounds(src_f);
+            /* FALLTHROUGH */
             H5_ATTR_FALLTHROUGH
         case H5R_OBJECT2:
         case H5R_ATTR:
             /* Decode reference */
-            if (H5R__decode((const unsigned char *)src_buf, &src_size, dst_ref) < 0)
+            if (H5R__decode((const unsigned char *)src_buf, &src_size, &tmp_ref) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Cannot decode reference")
             break;
 
@@ -644,17 +669,20 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
     } /* end switch */
 
     /* If no filename set, this is not an external reference */
-    if (NULL == H5R_REF_FILENAME(dst_ref)) {
+    if (NULL == H5R_REF_FILENAME(&tmp_ref)) {
         /* TODO temporary hack to retrieve file object */
         if ((file_id = H5F_get_file_id(src_file, H5I_FILE, FALSE)) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
 
         /* Attach loc ID to reference and hold reference to it, this is a
          * user exposed reference so set app_ref to TRUE. */
-        if (H5R__set_loc_id(dst_ref, file_id, TRUE, TRUE) < 0)
+        if (H5R__set_loc_id(&tmp_ref, file_id, TRUE, TRUE) < 0)
             HGOTO_ERROR(H5E_REFERENCE, H5E_CANTSET, FAIL, "unable to attach location id to reference")
     } /* end if */
 
+    /* Set output info */
+    HDmemcpy(dst_ref, &tmp_ref, sizeof(tmp_ref));
+
 done:
     if ((file_id != H5I_INVALID_HID) && (H5I_dec_ref(file_id) < 0))
         HDONE_ERROR(H5E_REFERENCE, H5E_CANTDEC, FAIL, "unable to decrement refcount on location id")
@@ -678,6 +706,7 @@ H5T__ref_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbool_t
     herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Check parameters */
     HDassert(src_file);
@@ -720,6 +749,7 @@ H5T__ref_disk_setnull(H5VL_object_t *dst_file, void *dst_buf, void *bg_buf)
     herr_t   ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(dst_file);
     HDassert(dst_buf);
@@ -768,6 +798,7 @@ H5T__ref_disk_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_bu
     size_t         ret_value = 0;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_buf);
 
@@ -816,6 +847,7 @@ H5T__ref_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t H5_ATTR_
     herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_file);
     HDassert(src_buf);
@@ -861,6 +893,7 @@ H5T__ref_disk_write(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf,
     herr_t         ret_value     = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_buf);
     HDassert(src_size);
@@ -919,6 +952,7 @@ H5T__ref_obj_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbo
     herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Check parameters */
     HDassert(src_file);
@@ -970,6 +1004,7 @@ H5T__ref_obj_disk_getsize(H5VL_object_t *src_file, const void H5_ATTR_UNUSED *sr
     size_t ret_value = 0;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_file);
     HDassert(src_buf);
@@ -1016,6 +1051,7 @@ H5T__ref_obj_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t src_
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_file);
     HDassert(src_buf);
@@ -1068,6 +1104,7 @@ H5T__ref_dsetreg_disk_isnull(const H5VL_object_t *src_file, const void *src_buf,
     herr_t         ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     /* Check parameters */
     HDassert(src_file);
@@ -1122,6 +1159,7 @@ H5T__ref_dsetreg_disk_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void
 #else
     FUNC_ENTER_STATIC_NOERR
 #endif
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_buf);
 
@@ -1170,6 +1208,7 @@ H5T__ref_dsetreg_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t
     herr_t                 ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
+    H5T_REF_LOG_DEBUG("");
 
     HDassert(src_file);
     HDassert(src_buf);
@@ -1205,7 +1244,7 @@ done:
 } /* end H5T__ref_dsetreg_disk_read() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5T_ref_reclaim
+ * Function:    H5T__ref_reclaim
  *
  * Purpose: Internal routine to free reference datatypes
  *
@@ -1214,11 +1253,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_ref_reclaim(void *elem, const H5T_t *dt)
+H5T__ref_reclaim(void *elem, const H5T_t *dt)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
+    H5T_REF_LOG_DEBUG("");
 
     /* Sanity checks */
     HDassert(elem);
@@ -1229,4 +1269,4 @@ H5T_ref_reclaim(void *elem, const H5T_t *dt)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_ref_reclaim() */
+} /* end H5T__ref_reclaim() */
diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c
index d9ad791..5937f74 100644
--- a/src/H5Tstrpad.c
+++ b/src/H5Tstrpad.c
@@ -38,10 +38,6 @@
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 H5T_str_t
@@ -94,10 +90,6 @@ done:
  * Programmer:	Robb Matzke
  *		Friday, January	 9, 1998
  *
- * Modifications:
- * 	Robb Matzke, 22 Dec 1998
- *	Also works for derived datatypes.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
diff --git a/src/H5Tvisit.c b/src/H5Tvisit.c
index 312d112..7974d49 100644
--- a/src/H5Tvisit.c
+++ b/src/H5Tvisit.c
@@ -22,7 +22,7 @@
  *
  * Created:		H5Tvisit.c
  *			Jul 19 2007
- *			Quincey Koziol <koziol@hdfgroup.org>
+ *			Quincey Koziol
  *
  * Purpose:		Visit all the components of a datatype
  *
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 40c208f..e220450 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -160,7 +160,7 @@ H5Tvlen_create(hid_t base_id)
     if ((dt = H5T__vlen_create(base)) == NULL)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "invalid VL location")
 
-    /* Atomize the type */
+    /* Register the type */
     if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype")
 
@@ -1012,7 +1012,7 @@ done:
 } /* end H5T__vlen_disk_delete() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5T_vlen_reclaim
+ * Function:    H5T__vlen_reclaim
  *
  * Purpose: Internal recursive routine to free VL datatypes
  *
@@ -1024,7 +1024,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info)
+H5T__vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info)
 {
     unsigned    u;                   /* Local index variable */
     H5MM_free_t free_func;           /* Free function */
@@ -1133,7 +1133,7 @@ H5T_vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_vlen_reclaim() */
+} /* end H5T__vlen_reclaim() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5T_vlen_reclaim_elmt
@@ -1167,7 +1167,7 @@ H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to retrieve VL allocation info")
 
     /* Recurse on buffer to free dynamic fields */
-    if (H5T_vlen_reclaim(elem, dt, &vl_alloc_info) < 0)
+    if (H5T__vlen_reclaim(elem, dt, &vl_alloc_info) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "can't reclaim vlen elements")
 
 done: