diff options
Diffstat (limited to 'src/H5Toh.c')
| -rw-r--r-- | src/H5Toh.c | 153 |
1 files changed, 70 insertions, 83 deletions
diff --git a/src/H5Toh.c b/src/H5Toh.c index 7961706..a1891a6 100644 --- a/src/H5Toh.c +++ b/src/H5Toh.c @@ -1,89 +1,76 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * * All rights reserved. * * * * This file is part of HDF5. The full HDF5 copyright notice, including * * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://www.hdfgroup.org/licenses. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /****************/ /* Module Setup */ /****************/ -#define H5O_PACKAGE /*suppress error about including H5Opkg */ -#define H5T_PACKAGE /*suppress error about including H5Tpkg */ - +#define H5O_FRIEND /*suppress error about including H5Opkg */ +#include "H5Tmodule.h" /* This source code file is part of the H5T module */ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Iprivate.h" /* IDs */ -#include "H5Opkg.h" /* Object headers */ -#include "H5Tpkg.h" /* Datatypes */ - +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Iprivate.h" /* IDs */ +#include "H5Opkg.h" /* Object headers */ +#include "H5Tpkg.h" /* Datatypes */ /****************/ /* Local Macros */ /****************/ - /******************/ /* Local Typedefs */ /******************/ - /********************/ /* 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 void *H5O__dtype_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); +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); /*********************/ /* Package Variables */ /*********************/ - /*****************************/ /* Library Private Variables */ /*****************************/ - /*******************/ /* Local Variables */ /*******************/ /* This message derives from H5O object class */ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{ - H5O_TYPE_NAMED_DATATYPE, /* object type */ - "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 */ - NULL, /* get the index & heap info for an object */ - NULL /* flush an opened object of this class */ + H5O_TYPE_NAMED_DATATYPE, /* object type */ + "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 */ + 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. @@ -100,24 +87,23 @@ 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; /* Return value */ + htri_t ret_value = FAIL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_PACKAGE HDassert(oh); - if((ret_value = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to read object header") + if ((ret_value = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to read object header") 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 * @@ -129,35 +115,34 @@ done: * *------------------------------------------------------------------------- */ -static hid_t -H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t UNUSED lapl_id, hid_t dxpl_id, hbool_t app_ref) +static void * +H5O__dtype_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type) { - H5T_t *type = NULL; /* Datatype opened */ - hid_t ret_value; /* Return value */ + H5T_t *type = NULL; /* Datatype opened */ + void *ret_value = NULL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_PACKAGE HDassert(obj_loc); + *opened_type = H5I_DATATYPE; + /* Open the datatype */ - if(NULL == (type = H5T_open(obj_loc, dxpl_id))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to open datatype") + if (NULL == (type = H5T_open(obj_loc))) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to open datatype") - /* Register an ID for the datatype */ - if((ret_value = H5I_register(H5I_DATATYPE, type, app_ref)) < 0) - HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register datatype") + ret_value = (void *)type; done: - if(ret_value < 0) - if(type && H5T_close(type) < 0) - HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release datatype") + if (NULL == ret_value) + if (type && H5T_close(type) < 0) + HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, NULL, "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 * @@ -170,12 +155,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; /* Return value */ + 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_PACKAGE /* Sanity checks */ HDassert(f); @@ -183,13 +168,13 @@ 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) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to commit datatype") + 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 */ - if(NULL == (obj_loc->oloc = H5T_oloc(crt_info->dt))) + 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))) + 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 */ @@ -197,11 +182,10 @@ 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 * @@ -214,22 +198,25 @@ 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; /* Return value */ + H5T_t *type = NULL; /* Datatype opened */ + H5T_t *dt = NULL; + H5O_loc_t *ret_value = NULL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_PACKAGE /* Get the datatype */ - if(NULL == (type = (H5T_t *)H5I_object(obj_id))) - HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID") + if (NULL == (dt = (H5T_t *)H5I_object(obj_id))) + HGOTO_ERROR(H5E_OHDR, H5E_BADID, NULL, "couldn't get object from ID") + + /* If this is a named datatype, get the VOL driver pointer to the datatype */ + type = (H5T_t *)H5T_get_actual_type(dt); /* Get the datatype's object header location */ - if(NULL == (ret_value = H5T_oloc(type))) + if (NULL == (ret_value = H5T_oloc(type))) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5O_dtype_get_oloc() */ - +} /* end H5O__dtype_get_oloc() */ |