diff options
Diffstat (limited to 'src/H5Goh.c')
| -rw-r--r-- | src/H5Goh.c | 67 |
1 files changed, 62 insertions, 5 deletions
diff --git a/src/H5Goh.c b/src/H5Goh.c index 6ea3a00..598cd5a 100644 --- a/src/H5Goh.c +++ b/src/H5Goh.c @@ -18,15 +18,19 @@ /****************/ #define H5O_PACKAGE /*suppress error about including H5Opkg */ +#define H5G_PACKAGE /*suppress error about including H5Gpkg */ + /***********/ /* Headers */ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ +#include "H5Gpkg.h" /* Groups */ #include "H5Iprivate.h" /* IDs */ #include "H5Opkg.h" /* Object headers */ + /****************/ /* Local Macros */ /****************/ @@ -43,8 +47,11 @@ static htri_t H5O_group_isa(H5O_t *loc); static hid_t H5O_group_open(const H5G_loc_t *obj_loc, hid_t dxpl_id); +static void *H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, + hid_t dxpl_id); static H5O_loc_t *H5O_group_get_oloc(hid_t obj_id); + /*********************/ /* Package Variables */ /*********************/ @@ -67,6 +74,7 @@ const H5O_obj_class_t H5O_OBJ_GROUP[1] = {{ NULL, /* free 'copy file' user data */ H5O_group_isa, /* "isa" message */ H5O_group_open, /* open an object of this class */ + H5O_group_create, /* create an object of this class */ H5O_group_get_oloc /* get an object header location for an object */ }}; @@ -136,7 +144,7 @@ H5O_group_open(const H5G_loc_t *obj_loc, hid_t dxpl_id) HDassert(obj_loc); /* Open the group */ - if((grp = H5G_open(obj_loc, dxpl_id)) == NULL) + if(NULL == (grp = H5G_open(obj_loc, dxpl_id))) HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group") /* Register an ID for the group */ @@ -145,14 +153,63 @@ H5O_group_open(const H5G_loc_t *obj_loc, hid_t dxpl_id) done: if(ret_value < 0) - if(grp != NULL) - H5G_close(grp); + if(grp && H5G_close(grp) < 0) + HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group") FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_group_open() */ /*------------------------------------------------------------------------- + * Function: H5O_group_create + * + * Purpose: Create a group in a file + * + * Return: Success: Pointer to the group data structure + * Failure: NULL + * + * Programmer: Quincey Koziol + * Tuesday, April 10, 2007 + * + *------------------------------------------------------------------------- + */ +static void * +H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) +{ + H5G_obj_create_t *crt_info = (H5G_obj_create_t *)_crt_info; /* Group creation parameters */ + H5G_t *grp = NULL; /* New group created */ + void *ret_value; /* Return value */ + + FUNC_ENTER_NOAPI_NOINIT(H5O_group_create) + + /* Sanity checks */ + HDassert(f); + HDassert(crt_info); + HDassert(obj_loc); + + /* Create the the group */ + if(NULL == (grp = H5G_create(f, crt_info->gcpl_id, dxpl_id))) + HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group") + + /* Set up the new group's location */ + if(NULL == (obj_loc->oloc = H5G_oloc(grp))) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of group") + if(NULL == (obj_loc->path = H5G_nameof(grp))) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of group") + + /* Set the return value */ + ret_value = grp; + +done: + if(ret_value == NULL) + if(grp && H5G_close(grp) < 0) + HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release group") + + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5O_group_create() */ + + +/*------------------------------------------------------------------------- * Function: H5O_group_get_oloc * * Purpose: Retrieve the object header location for an open object @@ -174,11 +231,11 @@ H5O_group_get_oloc(hid_t obj_id) FUNC_ENTER_NOAPI_NOINIT(H5O_group_get_oloc) /* Get the group */ - if((grp = H5I_object(obj_id)) == NULL) + if(NULL == (grp = H5I_object(obj_id))) HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID") /* Get the group's object header location */ - if((ret_value = H5G_oloc(grp)) == NULL) + if(NULL == (ret_value = H5G_oloc(grp))) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object") done: |