Add API context interface and use it throughout the library.

1 files changed, 26 insertions, 28 deletions

diff --git a/src/H5Toh.c b/src/H5Toh.c
index 01cefe1..c0139fe 100644
--- a/src/H5Toh.c
+++ b/src/H5Toh.c
@@ -43,12 +43,10 @@
 /* Local Prototypes */
 /********************/
 
-static htri_t H5O_dtype_isa(H5O_t *loc);
-static hid_t H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t lapl_id,
-    hid_t dxpl_id, hbool_t app_ref);
-static void *H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc,
-    hid_t dxpl_id);
-static H5O_loc_t *H5O_dtype_get_oloc(hid_t obj_id);
+static htri_t H5O__dtype_isa(const H5O_t *loc);
+static hid_t H5O__dtype_open(const H5G_loc_t *obj_loc, hbool_t app_ref);
+static void *H5O__dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc);
+static H5O_loc_t *H5O__dtype_get_oloc(hid_t obj_id);
 
 
 /*********************/
@@ -71,17 +69,17 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
     "named datatype",		/* object name, for debugging	*/
     NULL,			/* get 'copy file' user data	*/
     NULL,			/* free 'copy file' user data	*/
-    H5O_dtype_isa, 		/* "isa" 			*/
-    H5O_dtype_open, 		/* open an object of this class */
-    H5O_dtype_create, 		/* create an object of this class */
-    H5O_dtype_get_oloc,		/* get an object header location for an object */
+    H5O__dtype_isa, 		/* "isa" 			*/
+    H5O__dtype_open, 		/* open an object of this class */
+    H5O__dtype_create, 		/* create an object of this class */
+    H5O__dtype_get_oloc,	/* get an object header location for an object */
     NULL,			/* get the index & heap info for an object */
     NULL 			/* flush an opened object of this class */
 }};
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_dtype_isa
+ * Function:	H5O__dtype_isa
  *
  * Purpose:	Determines if an object has the requisite messages for being
  *		a datatype.
@@ -98,11 +96,11 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
  *-------------------------------------------------------------------------
  */
 static htri_t
-H5O_dtype_isa(struct H5O_t *oh)
+H5O__dtype_isa(const H5O_t *oh)
 {
     htri_t	ret_value = FAIL;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     HDassert(oh);
 
@@ -111,11 +109,11 @@ H5O_dtype_isa(struct H5O_t *oh)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_dtype_isa() */
+} /* end H5O__dtype_isa() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_dtype_open
+ * Function:	H5O__dtype_open
  *
  * Purpose:	Open a datatype at a particular location
  *
@@ -128,17 +126,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t H5_ATTR_UNUSED lapl_id, hid_t dxpl_id, hbool_t app_ref)
+H5O__dtype_open(const H5G_loc_t *obj_loc, hbool_t app_ref)
 {
     H5T_t       *type = NULL;           /* Datatype opened */
     hid_t	ret_value = H5I_INVALID_HID;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     HDassert(obj_loc);
 
     /* Open the datatype */
-    if(NULL == (type = H5T_open(obj_loc, dxpl_id)))
+    if(NULL == (type = H5T_open(obj_loc)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
 
     /* Register an ID for the datatype */
@@ -151,11 +149,11 @@ done:
             HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_dtype_open() */
+} /* end H5O__dtype_open() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_dtype_create
+ * Function:	H5O__dtype_create
  *
  * Purpose:	Create a named datatype in a file
  *
@@ -168,12 +166,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
+H5O__dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc)
 {
     H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */
     void *ret_value = NULL;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Sanity checks */
     HDassert(f);
@@ -181,7 +179,7 @@ H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc);
 
     /* Commit the type to the file */
-    if(H5T__commit(f, crt_info->dt, crt_info->tcpl_id, dxpl_id) < 0)
+    if(H5T__commit(f, crt_info->dt, crt_info->tcpl_id) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to commit datatype")
 
     /* Set up the new named datatype's location */
@@ -195,11 +193,11 @@ H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_dtype_create() */
+} /* end H5O__dtype_create() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_dtype_get_oloc
+ * Function:	H5O__dtype_get_oloc
  *
  * Purpose:	Retrieve the object header location for an open object
  *
@@ -212,12 +210,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5O_loc_t *
-H5O_dtype_get_oloc(hid_t obj_id)
+H5O__dtype_get_oloc(hid_t obj_id)
 {
     H5T_t       *type;                  /* Datatype opened */
     H5O_loc_t	*ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Get the datatype */
     if(NULL == (type = (H5T_t *)H5I_object(obj_id)))
@@ -229,5 +227,5 @@ H5O_dtype_get_oloc(hid_t obj_id)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_dtype_get_oloc() */
+} /* end H5O__dtype_get_oloc() */