[svn-r13636] Description:

    Change H5[D|G|T]<foo>_expand() "temporary" API routines to
H5[D|G|T]<foo>2() "versioned" routines.  Also added
H5[D|G|T](create|commit)_anon() routines to continue to allow "anonymous"
objects to be created in a file.

Tested on:
    Mac OS X/32 10.4.9 (amazon)
    FreeBSD/32 6.2 (duty)
    FreeBSD/64 6.2 (liberty)
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)

1 files changed, 56 insertions, 6 deletions

diff --git a/src/H5Toh.c b/src/H5Toh.c
index 2c952e1..6e851f6 100644
--- a/src/H5Toh.c
+++ b/src/H5Toh.c
@@ -18,6 +18,8 @@
 /****************/
 
 #define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
+
 
 /***********/
 /* Headers */
@@ -26,6 +28,7 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Opkg.h"             /* Object headers			*/
+#include "H5Tpkg.h"		/* Datatypes				*/
 
 
 /****************/
@@ -44,6 +47,8 @@
 
 static htri_t H5O_dtype_isa(H5O_t *loc);
 static hid_t H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t dxpl_id);
+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);
 
 
@@ -69,6 +74,7 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
     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 */
 }};
 
@@ -131,8 +137,8 @@ H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t dxpl_id)
     HDassert(obj_loc);
 
     /* Open the datatype */
-    if((type = H5T_open(obj_loc, dxpl_id)) == NULL)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
+    if(NULL == (type = H5T_open(obj_loc, dxpl_id)))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
 
     /* Register an ID for the datatype */
     if((ret_value = H5I_register(H5I_DATATYPE, type)) < 0)
@@ -140,14 +146,58 @@ H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t dxpl_id)
 
 done:
     if(ret_value < 0)
-        if(type != NULL)
-            H5T_close(type);
+        if(type && H5T_close(type) < 0)
+            HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release datatype")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_dtype_open() */
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5O_dtype_create
+ *
+ * Purpose:	Create a named datatype in a file
+ *
+ * Return:	Success:	Pointer to the named datatype data structure
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, April 11, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
+{
+    H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */
+    void *ret_value;            /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_create)
+
+    /* Sanity checks */
+    HDassert(f);
+    HDassert(crt_info);
+    HDassert(obj_loc);
+
+    /* Commit the type to the file */
+    if(H5T_commit(f, crt_info->dt, crt_info->tcpl_id, dxpl_id) < 0)
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to commit datatype")
+
+    /* Set up the new named datatype's location */
+    if(NULL == (obj_loc->oloc = H5T_oloc(crt_info->dt)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of named datatype")
+    if(NULL == (obj_loc->path = H5T_nameof(crt_info->dt)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of named datatype")
+
+    /* Set the return value */
+    ret_value = crt_info->dt;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_dtype_create() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5O_dtype_get_oloc
  *
  * Purpose:	Retrieve the object header location for an open object
@@ -169,11 +219,11 @@ H5O_dtype_get_oloc(hid_t obj_id)
     FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_get_oloc)
 
     /* Get the datatype */
-    if((type = H5I_object(obj_id)) == NULL)
+    if(NULL == (type = H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the datatype's object header location */
-    if((ret_value = H5T_oloc(type)) == NULL)
+    if(NULL == (ret_value = H5T_oloc(type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object")
 
 done: