From 3ab9ea9cedfa8a619ba92da60777ce62750b9fe8 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Thu, 24 Jul 2014 15:54:03 -0500 Subject: [svn-r25482] - update is_accessible implementation to use fapl and pass it down to H5Fint.c - move is_HDF5 inside deprecated macros in H5Fpublic.h - move H5ES_status_t outside of H5VLpublic.h to H5ESpublic.h - rename public properties in H5VLpublic.h to H5VL_PROP_* to add more scoping - no need to include private if pkg is included in H5VLnative.c - rename plist_id to lapl_id in loc_params structs --- src/CMakeLists.txt | 4 +++ src/H5A.c | 32 ++++++++--------- src/H5Adeprec.c | 6 ++-- src/H5D.c | 10 +++--- src/H5Ddeprec.c | 6 ++-- src/H5ESpublic.h | 40 +++++++++++++++++++++ src/H5Fdeprec.c | 2 +- src/H5Fint.c | 4 +-- src/H5Fpkg.h | 2 +- src/H5Fpublic.h | 2 +- src/H5G.c | 6 ++-- src/H5Gdeprec.c | 42 +++++++++++----------- src/H5L.c | 48 ++++++++++++------------- src/H5Lexternal.c | 8 ++--- src/H5O.c | 22 ++++++------ src/H5Pacpl.c | 6 ++-- src/H5Pdcpl.c | 6 ++-- src/H5Pgcpl.c | 2 +- src/H5Plcpl.c | 12 +++---- src/H5R.c | 2 +- src/H5Rdeprec.c | 2 +- src/H5VLint.c | 2 +- src/H5VLnative.c | 101 +++++++++++++++++++++++++---------------------------- src/H5VLpublic.h | 55 +++++++++++++---------------- src/Makefile.am | 2 +- src/Makefile.in | 2 +- 26 files changed, 229 insertions(+), 197 deletions(-) create mode 100644 src/H5ESpublic.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a31609..c1df07b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -159,6 +159,10 @@ set (H5EA_HDRS ) IDE_GENERATED_PROPERTIES ("H5EA" "${H5EA_HDRS}" "${H5EA_SRCS}" ) +set (H5ES_HDRS + ${HDF5_SRC_DIR}/H5ESpublic.h +) +IDE_GENERATED_PROPERTIES ("H5ES" "${H5ES_HDRS}" "" ) set (H5F_SRCS ${HDF5_SRC_DIR}/H5F.c diff --git a/src/H5A.c b/src/H5A.c index 21e1d78..33ee9de 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -253,9 +253,9 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") loc_params.type = H5VL_OBJECT_BY_SELF; @@ -350,15 +350,15 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5VL_get_object(loc_id))) @@ -497,7 +497,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -582,7 +582,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -946,7 +946,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the name through the VOL */ @@ -1099,7 +1099,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ @@ -1182,7 +1182,7 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ @@ -1324,7 +1324,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -1501,7 +1501,7 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -1613,7 +1613,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ @@ -1688,7 +1688,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ @@ -1705,7 +1705,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, #if 0 loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the attribute info through the VOL */ if(H5VL_object_misc(loc_id, H5VL_ATTR_DELETE_BY_IDX, H5AC_dxpl_id, H5_EVENT_STACK_NULL, loc_params, @@ -1851,7 +1851,7 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the attribute info through the VOL */ diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 45e5e05..f40a19c 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -188,9 +188,9 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_ATTR_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") loc_params.type = H5VL_OBJECT_BY_SELF; @@ -330,7 +330,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) loc_params.loc_data.loc_by_idx.idx_type = H5_INDEX_CRT_ORDER; loc_params.loc_data.loc_by_idx.order = H5_ITER_INC; loc_params.loc_data.loc_by_idx.n = (hsize_t)idx; - loc_params.loc_data.loc_by_idx.plist_id = H5P_LINK_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_idx.lapl_id = H5P_LINK_ACCESS_DEFAULT; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ diff --git a/src/H5D.c b/src/H5D.c index fdcfb74..b8fc0ed 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -188,11 +188,11 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") - if(H5P_set(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") loc_params.type = H5VL_OBJECT_BY_SELF; @@ -289,9 +289,9 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") loc_params.type = H5VL_OBJECT_BY_SELF; diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index d2398c3..11e1f6e 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -187,11 +187,11 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id") - if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") - if(H5P_set(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0) + if(H5P_set(plist, H5VL_PROP_DSET_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") loc_params.type = H5VL_OBJECT_BY_SELF; diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h new file mode 100644 index 0000000..c6efd91 --- /dev/null +++ b/src/H5ESpublic.h @@ -0,0 +1,40 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * 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. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/* + * Programmer: Mohamad Chaarawi + * July 24, 2014 + */ +#ifndef _H5ESpublic_H +#define _H5ESpublic_H + +/* Asynchronous operation status */ +typedef enum H5ES_status_t { + H5ES_STATUS_IN_PROGRESS, /* Operation has not yet completed */ + H5ES_STATUS_SUCCEED, /* Operation has completed, successfully */ + H5ES_STATUS_FAIL, /* Operation has completed, but failed */ + H5ES_STATUS_CANCEL /* Operation has not completed and has been cancelled */ +} H5ES_status_t; + +#ifdef __cplusplus +extern "C" { +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _H5ESpublic_H */ diff --git a/src/H5Fdeprec.c b/src/H5Fdeprec.c index 258f5fb..f5a7c5d 100644 --- a/src/H5Fdeprec.c +++ b/src/H5Fdeprec.c @@ -227,7 +227,7 @@ H5Fis_hdf5(const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "no file name specified") /* Call private routine */ - if((ret_value = H5F_is_hdf5(name)) < 0) + if((ret_value = H5F_is_hdf5(name, H5P_FILE_ACCESS_DEFAULT)) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file") done: diff --git a/src/H5Fint.c b/src/H5Fint.c index 00ab3ec..19df411 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -632,7 +632,7 @@ done: *------------------------------------------------------------------------- */ htri_t -H5F_is_hdf5(const char *name) +H5F_is_hdf5(const char *name, hid_t fapl_id) { H5FD_t *file = NULL; /* Low-level file struct */ haddr_t sig_addr; /* Addess of hdf5 file signature */ @@ -641,7 +641,7 @@ H5F_is_hdf5(const char *name) FUNC_ENTER_NOAPI_NOINIT /* Open the file at the virtual file layer */ - if(NULL == (file = H5FD_open(name, H5F_ACC_RDONLY, H5P_FILE_ACCESS_DEFAULT, HADDR_UNDEF))) + if(NULL == (file = H5FD_open(name, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF))) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file") /* The file is an hdf5 file if the hdf5 file signature can be found */ diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index f3ae7fc..7565823 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -295,7 +295,7 @@ H5_DLL herr_t H5F_init(void); H5_DLL herr_t H5F__term_deprec_interface(void); H5_DLL H5F_t *H5F_reopen(H5F_t *f); H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing); -H5_DLL htri_t H5F_is_hdf5(const char *name); +H5_DLL htri_t H5F_is_hdf5(const char *name, hid_t fapl_id); H5_DLL herr_t H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_list, hbool_t app_ref, size_t *obj_id_count_ptr); H5_DLL int H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key); diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 6f7ae37..54d5ce0 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -174,7 +174,6 @@ extern "C" { #endif /* Functions in H5F.c */ -H5_DLL htri_t H5Fis_hdf5(const char *filename); H5_DLL htri_t H5Fis_accessible(const char *container_name, hid_t fapl_id); H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist); @@ -238,6 +237,7 @@ typedef struct H5F_info1_t { /* Function prototypes */ H5_DLL herr_t H5Fget_info1(hid_t obj_id, H5F_info1_t *finfo); +H5_DLL htri_t H5Fis_hdf5(const char *filename); #endif /* H5_NO_DEPRECATED_SYMBOLS */ diff --git a/src/H5G.c b/src/H5G.c index a25b30b..5bd0c4a 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -313,7 +313,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t g if(NULL == (plist = (H5P_genplist_t *)H5I_object(gcpl_id))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") - if(H5P_set(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0) + if(H5P_set(plist, H5VL_PROP_GRP_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") loc_params.type = H5VL_OBJECT_BY_SELF; @@ -629,7 +629,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ @@ -696,7 +696,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the plugin pointer */ diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 285c823..7c6feb2 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -271,7 +271,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* get creation properties */ - if(H5P_set(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0) + if(H5P_set(plist, H5VL_PROP_GRP_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id") loc_params.type = H5VL_OBJECT_BY_SELF; @@ -403,11 +403,11 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.obj_type = H5I_get_type(cur_loc_id); loc_params1.loc_data.loc_by_name.name = cur_name; - loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.loc_data.loc_by_name.name = new_name; - loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; /* get the file object */ if(NULL == (obj = (void *)H5I_object(cur_loc_id))) @@ -417,9 +417,9 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET, &obj) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target") - if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target loc params") /* Create the link through the VOL */ @@ -434,7 +434,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = new_name; - loc_params.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params.obj_type = H5I_get_type(cur_loc_id); /* get the file object */ @@ -445,7 +445,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_NAME, &cur_name) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name") /* Create the link through the VOL */ @@ -501,12 +501,12 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.obj_type = H5I_get_type(cur_loc_id); loc_params1.loc_data.loc_by_name.name = cur_name; - loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.obj_type = H5I_get_type(new_loc_id); loc_params2.loc_data.loc_by_name.name = new_name; - loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; /* get the file object */ if(NULL == (obj1 = (void *)H5I_object(cur_loc_id))) @@ -523,9 +523,9 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET, &obj1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id") - if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name") /* Create the link through the VOL */ @@ -546,7 +546,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = new_name; - loc_params.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params.obj_type = H5I_get_type(new_loc_id); /* get the file object */ @@ -557,7 +557,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_NAME, &cur_name) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name") /* Create the link through the VOL */ @@ -595,11 +595,11 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.obj_type = H5I_get_type(src_loc_id); loc_params1.loc_data.loc_by_name.name = src_name; - loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.loc_data.loc_by_name.name = dst_name; - loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; /* get the file object */ if(NULL == (obj = (void *)H5I_object(src_loc_id))) @@ -643,12 +643,12 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* set location paramter for source object */ loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.loc_data.loc_by_name.name = src_name; - loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params1.obj_type = H5I_get_type(src_loc_id); /* set location paramter for destination object */ loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.loc_data.loc_by_name.name = dst_name; - loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT; + loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT; loc_params2.obj_type = H5I_get_type(dst_loc_id); if(H5L_SAME_LOC != src_loc_id) { @@ -708,7 +708,7 @@ H5Gunlink(hid_t loc_id, const char *name) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -752,7 +752,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -804,7 +804,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -865,7 +865,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ diff --git a/src/H5L.c b/src/H5L.c index f14119f..253b8f7 100644 --- a/src/H5L.c +++ b/src/H5L.c @@ -297,12 +297,12 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* set location paramter for source object */ loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.loc_data.loc_by_name.name = src_name; - loc_params1.loc_data.loc_by_name.plist_id = lapl_id; + loc_params1.loc_data.loc_by_name.lapl_id = lapl_id; loc_params1.obj_type = H5I_get_type(src_loc_id); /* set location paramter for destination object */ loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.loc_data.loc_by_name.name = dst_name; - loc_params2.loc_data.loc_by_name.plist_id = lapl_id; + loc_params2.loc_data.loc_by_name.lapl_id = lapl_id; loc_params2.obj_type = H5I_get_type(dst_loc_id); if(H5L_SAME_LOC != src_loc_id) { @@ -388,12 +388,12 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* set location paramter for source object */ loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.loc_data.loc_by_name.name = src_name; - loc_params1.loc_data.loc_by_name.plist_id = lapl_id; + loc_params1.loc_data.loc_by_name.lapl_id = lapl_id; loc_params1.obj_type = H5I_get_type(src_loc_id); /* set location paramter for destination object */ loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.loc_data.loc_by_name.name = dst_name; - loc_params2.loc_data.loc_by_name.plist_id = lapl_id; + loc_params2.loc_data.loc_by_name.lapl_id = lapl_id; loc_params2.obj_type = H5I_get_type(dst_loc_id); if(H5L_SAME_LOC != src_loc_id) { @@ -478,7 +478,7 @@ H5Lcreate_soft(const char *link_target, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = link_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(link_loc_id); /* get the file object */ @@ -493,7 +493,7 @@ H5Lcreate_soft(const char *link_target, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &link_target) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_NAME, &link_target) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name") /* Create the link through the VOL */ @@ -559,12 +559,12 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, loc_params1.type = H5VL_OBJECT_BY_NAME; loc_params1.obj_type = H5I_get_type(cur_loc_id); loc_params1.loc_data.loc_by_name.name = cur_name; - loc_params1.loc_data.loc_by_name.plist_id = lapl_id; + loc_params1.loc_data.loc_by_name.lapl_id = lapl_id; loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.obj_type = H5I_get_type(new_loc_id); loc_params2.loc_data.loc_by_name.name = new_name; - loc_params2.loc_data.loc_by_name.plist_id = lapl_id; + loc_params2.loc_data.loc_by_name.lapl_id = lapl_id; if(H5L_SAME_LOC != cur_loc_id) { /* get the file object */ @@ -593,9 +593,9 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET, &obj1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id") - if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name") /* Create the link through the VOL */ @@ -662,7 +662,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = link_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(link_loc_id); /* get the file object */ @@ -677,11 +677,11 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TYPE, &link_type) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TYPE, &link_type) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") - if(H5P_set(plist, H5VL_LINK_UDATA, &udata) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_UDATA, &udata) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") - if(H5P_set(plist, H5VL_LINK_UDATA_SIZE, &udata_size) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_UDATA_SIZE, &udata_size) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") /* Create the link through the VOL */ @@ -729,7 +729,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -796,7 +796,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -858,7 +858,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -927,7 +927,7 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -983,7 +983,7 @@ H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -1038,7 +1038,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -1103,7 +1103,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -1299,7 +1299,7 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -1439,7 +1439,7 @@ H5Literate_by_name(hid_t loc_id, const char *group_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = group_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) @@ -1590,7 +1590,7 @@ H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.obj_type = H5I_get_type(loc_id); loc_params.loc_data.loc_by_name.name = group_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; /* get the file object */ if(NULL == (obj = (void *)H5I_object(loc_id))) diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index cc8fdae..c00b44a 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -610,7 +610,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = link_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(link_loc_id); /* get the file object */ @@ -625,11 +625,11 @@ H5Lcreate_external(const char *file_name, const char *obj_name, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TYPE, &link_type) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TYPE, &link_type) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") - if(H5P_set(plist, H5VL_LINK_UDATA, &ext_link_buf) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_UDATA, &ext_link_buf) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") - if(H5P_set(plist, H5VL_LINK_UDATA_SIZE, &buf_size) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_UDATA_SIZE, &buf_size) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist") /* Create the link through the VOL */ diff --git a/src/H5O.c b/src/H5O.c index a55a3e0..e5439b1 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -243,7 +243,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -321,7 +321,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -474,7 +474,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, loc_params2.type = H5VL_OBJECT_BY_NAME; loc_params2.obj_type = H5I_get_type(new_loc_id); loc_params2.loc_data.loc_by_name.name = new_name; - loc_params2.loc_data.loc_by_name.plist_id = lapl_id; + loc_params2.loc_data.loc_by_name.lapl_id = lapl_id; if(H5L_SAME_LOC != obj_id) { /* get the file object */ @@ -503,9 +503,9 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* set creation properties */ - if(H5P_set(plist, H5VL_LINK_TARGET, &obj1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id") - if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) + if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id") /* Create the link through the VOL */ @@ -655,7 +655,7 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id) loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -759,7 +759,7 @@ H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lap loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -827,7 +827,7 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; loc_params.loc_data.loc_by_idx.n = n; - loc_params.loc_data.loc_by_idx.plist_id = lapl_id; + loc_params.loc_data.loc_by_idx.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -934,7 +934,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -1038,7 +1038,7 @@ H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t buf loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ @@ -1191,7 +1191,7 @@ H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; - loc_params.loc_data.loc_by_name.plist_id = lapl_id; + loc_params.loc_data.loc_by_name.lapl_id = lapl_id; loc_params.obj_type = H5I_get_type(loc_id); /* get the file object */ diff --git a/src/H5Pacpl.c b/src/H5Pacpl.c index 85c815b..89f4649 100644 --- a/src/H5Pacpl.c +++ b/src/H5Pacpl.c @@ -116,17 +116,17 @@ H5P_acrt_reg_prop(H5P_genclass_t *pclass) FUNC_ENTER_NOAPI_NOINIT /* Register the type ID property*/ - if(H5P_register_real(pclass, H5VL_ATTR_TYPE_ID, sizeof(hid_t), &type_id, + if(H5P_register_real(pclass, H5VL_PROP_ATTR_TYPE_ID, sizeof(hid_t), &type_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the space ID property */ - if(H5P_register_real(pclass, H5VL_ATTR_SPACE_ID, sizeof(hid_t), &space_id, + if(H5P_register_real(pclass, H5VL_PROP_ATTR_SPACE_ID, sizeof(hid_t), &space_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the lcpl ID property */ - if(H5P_register_real(pclass, H5VL_ATTR_LOC_PARAMS, H5A_CRT_LOCATION_SIZE, &loc_params, + if(H5P_register_real(pclass, H5VL_PROP_ATTR_LOC_PARAMS, H5A_CRT_LOCATION_SIZE, &loc_params, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index c510843..6e31af9 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -238,17 +238,17 @@ H5P__dcrt_reg_prop(H5P_genclass_t *pclass) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the type ID property*/ - if(H5P_register_real(pclass, H5VL_DSET_TYPE_ID, sizeof(hid_t), &type_id, + if(H5P_register_real(pclass, H5VL_PROP_DSET_TYPE_ID, sizeof(hid_t), &type_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the space ID property */ - if(H5P_register_real(pclass, H5VL_DSET_SPACE_ID, sizeof(hid_t), &space_id, + if(H5P_register_real(pclass, H5VL_PROP_DSET_SPACE_ID, sizeof(hid_t), &space_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the lcpl ID property */ - if(H5P_register_real(pclass, H5VL_DSET_LCPL_ID, sizeof(hid_t), &lcpl_id, + if(H5P_register_real(pclass, H5VL_PROP_DSET_LCPL_ID, sizeof(hid_t), &lcpl_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index 6de7a42..0ce3ca8 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -146,7 +146,7 @@ H5P__gcrt_reg_prop(H5P_genclass_t *pclass) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the lcpl ID property */ - if(H5P_register_real(pclass, H5VL_GRP_LCPL_ID, sizeof(hid_t), &lcpl_id, + if(H5P_register_real(pclass, H5VL_PROP_GRP_LCPL_ID, sizeof(hid_t), &lcpl_id, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c index 72f5b6b..7d2b7f4 100644 --- a/src/H5Plcpl.c +++ b/src/H5Plcpl.c @@ -162,27 +162,27 @@ H5P_lcrt_reg_prop(H5P_genclass_t *pclass) NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_TARGET, H5L_CRT_TARGET_SIZE, &target, + if(H5P_register_real(pclass, H5VL_PROP_LINK_TARGET, H5L_CRT_TARGET_SIZE, &target, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_TARGET_LOC_PARAMS, H5L_CRT_LOCATION_SIZE, &loc_params, + if(H5P_register_real(pclass, H5VL_PROP_LINK_TARGET_LOC_PARAMS, H5L_CRT_LOCATION_SIZE, &loc_params, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_TARGET_NAME, H5L_CRT_TARGET_NAME_SIZE, &target_name, + if(H5P_register_real(pclass, H5VL_PROP_LINK_TARGET_NAME, H5L_CRT_TARGET_NAME_SIZE, &target_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_TYPE, H5L_CRT_LINK_TYPE_SIZE, &link_type, + if(H5P_register_real(pclass, H5VL_PROP_LINK_TYPE, H5L_CRT_LINK_TYPE_SIZE, &link_type, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_UDATA, H5L_CRT_UDATA_SIZE, &udata, + if(H5P_register_real(pclass, H5VL_PROP_LINK_UDATA, H5L_CRT_UDATA_SIZE, &udata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") - if(H5P_register_real(pclass, H5VL_LINK_UDATA_SIZE, H5L_CRT_UDATA_SIZE_SIZE, &udata_size, + if(H5P_register_real(pclass, H5VL_PROP_LINK_UDATA_SIZE, H5L_CRT_UDATA_SIZE_SIZE, &udata_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") diff --git a/src/H5R.c b/src/H5R.c index af446ef..6f55e71 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -600,7 +600,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r loc_params.type = H5VL_OBJECT_BY_REF; loc_params.loc_data.loc_by_ref.ref_type = ref_type; loc_params.loc_data.loc_by_ref._ref = _ref; - loc_params.loc_data.loc_by_ref.plist_id = oapl_id; + loc_params.loc_data.loc_by_ref.lapl_id = oapl_id; loc_params.obj_type = H5I_get_type(obj_id); /* Open the object through the VOL */ diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 763b553..57b31aa 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -248,7 +248,7 @@ H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *_ref) loc_params.type = H5VL_OBJECT_BY_REF; loc_params.loc_data.loc_by_ref.ref_type = ref_type; loc_params.loc_data.loc_by_ref._ref = _ref; - loc_params.loc_data.loc_by_ref.plist_id = H5P_DATASET_ACCESS_DEFAULT; + loc_params.loc_data.loc_by_ref.lapl_id = H5P_DATASET_ACCESS_DEFAULT; loc_params.obj_type = H5I_get_type(obj_id); /* Open the object through the VOL */ diff --git a/src/H5VLint.c b/src/H5VLint.c index cd3e09c..9f2177b 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -821,7 +821,7 @@ H5VL_datatype_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; - loc_params.loc_data.loc_by_name.plist_id = tapl_id; + loc_params.loc_data.loc_by_name.lapl_id = tapl_id; /* Open the object class */ if((ret_value = H5VL_object_open(id, loc_params, dxpl_id, estack_id)) < 0) diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 7cc98eb..6dacb5e 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -36,16 +36,12 @@ #include "H5private.h" /* Generic Functions */ #include "H5Apkg.h" /* Attribute pkg */ -#include "H5Aprivate.h" /* Attributes */ #include "H5Dpkg.h" /* Dataset pkg */ -#include "H5Dprivate.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fprivate.h" /* File access */ #include "H5Fpkg.h" /* File pkg */ #include "H5Gpkg.h" /* Groups */ #include "H5HGprivate.h" /* Global Heaps */ #include "H5Iprivate.h" /* IDs */ -#include "H5Lprivate.h" /* links */ #include "H5Lpkg.h" /* links headers */ #include "H5MFprivate.h" /* File memory management */ #include "H5MMprivate.h" /* Memory management */ @@ -54,7 +50,6 @@ #include "H5Rpkg.h" /* References */ #include "H5SMprivate.h" /* Shared Object Header Messages */ #include "H5Tpkg.h" /* Datatypes */ -#include "H5Tprivate.h" /* Datatypes */ #include "H5VLprivate.h" /* VOL plugins */ #include "H5VLnative.h" /* Native VOL plugin */ @@ -453,9 +448,9 @@ H5VL_native_attr_create(void *obj, H5VL_loc_params_t loc_params, const char *att HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID") /* get creation properties */ - if(H5P_get(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0) + if(H5P_get(plist, H5VL_PROP_ATTR_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for datatype id") - if(H5P_get(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0) + if(H5P_get(plist, H5VL_PROP_ATTR_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for space id") if(H5G_loc_real(obj, loc_params.obj_type, &loc) < 0) @@ -488,7 +483,7 @@ H5VL_native_attr_create(void *obj, H5VL_loc_params_t loc_params, const char *att /* Find the object's location */ if(H5G_loc_find(&loc, loc_params.loc_data.loc_by_name.name, &obj_loc/*out*/, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, NULL, "object not found") loc_found = TRUE; @@ -547,7 +542,7 @@ H5VL_native_attr_open(void *obj, H5VL_loc_params_t loc_params, const char *attr_ else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Aopen_by_name */ /* Open the attribute on the object header */ if(NULL == (attr = H5A_open_by_name(&loc, loc_params.loc_data.loc_by_name.name, attr_name, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id))) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "can't open attribute") } else if(loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Aopen_by_idx */ @@ -556,7 +551,7 @@ H5VL_native_attr_open(void *obj, H5VL_loc_params_t loc_params, const char *attr_ loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_ind_dxpl_id))) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open attribute") } else { @@ -696,12 +691,12 @@ static herr_t H5VL_native_attr_iterate(void *obj, H5VL_loc_params_t loc_params, /* Find the object's location */ if(H5G_loc_find(&loc, loc_params.loc_data.loc_by_name.name, &obj_loc/*out*/, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found"); loc_found = TRUE; /* Open the object */ - if((obj_loc_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_name.plist_id, + if((obj_loc_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id, TRUE)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open object"); @@ -795,7 +790,7 @@ H5VL_native_attr_get(void *obj, H5VL_attr_get_t get_type, hid_t UNUSED dxpl_id, /* Check if the attribute exists */ if((*ret = H5A_exists_by_name(loc, loc_params.loc_data.loc_by_name.name, attr_name, - loc_params.loc_data.loc_by_name.plist_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists") } else { @@ -861,7 +856,7 @@ H5VL_native_attr_get(void *obj, H5VL_attr_get_t get_type, hid_t UNUSED dxpl_id, loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, - loc_params.loc_data.loc_by_idx.plist_id, + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute") @@ -907,7 +902,7 @@ H5VL_native_attr_get(void *obj, H5VL_attr_get_t get_type, hid_t UNUSED dxpl_id, /* Open the attribute on the object header */ if(NULL == (attr = H5A_open_by_name(&loc, loc_params.loc_data.loc_by_name.name, attr_name, - loc_params.loc_data.loc_by_name.plist_id, + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute") @@ -931,7 +926,7 @@ H5VL_native_attr_get(void *obj, H5VL_attr_get_t get_type, hid_t UNUSED dxpl_id, loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, - loc_params.loc_data.loc_by_idx.plist_id, + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute") @@ -1009,7 +1004,7 @@ H5VL_native_attr_remove(void *obj, H5VL_loc_params_t loc_params, const char *att /* Find the object's location */ if(H5G_loc_find(&loc, loc_params.loc_data.loc_by_name.name, &obj_loc/*out*/, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found") loc_found = TRUE; @@ -1025,7 +1020,7 @@ H5VL_native_attr_remove(void *obj, H5VL_loc_params_t loc_params, const char *att /* Find the object's location */ if(H5G_loc_find(&loc, loc_params.loc_data.loc_by_idx.name, &obj_loc/*out*/, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_dxpl_id) < 0) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found") loc_found = TRUE; @@ -1370,11 +1365,11 @@ H5VL_native_dataset_create(void *obj, H5VL_loc_params_t loc_params, const char * HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID") /* get creation properties */ - if(H5P_get(plist, H5VL_DSET_TYPE_ID, &type_id) < 0) + if(H5P_get(plist, H5VL_PROP_DSET_TYPE_ID, &type_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for datatype id") - if(H5P_get(plist, H5VL_DSET_SPACE_ID, &space_id) < 0) + if(H5P_get(plist, H5VL_PROP_DSET_SPACE_ID, &space_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for space id") - if(H5P_get(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0) + if(H5P_get(plist, H5VL_PROP_DSET_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for lcpl id") /* Check arguments */ @@ -2086,12 +2081,12 @@ H5VL_native_file_misc(void *obj, H5VL_file_misc_t misc_type, hid_t UNUSED dxpl_i /* H5Fis_accessible */ case H5VL_FILE_IS_ACCESSIBLE: { - hid_t UNUSED fapl_id = va_arg (arguments, hid_t); + hid_t fapl_id = va_arg (arguments, hid_t); const char *name = va_arg (arguments, const char *); htri_t *ret = va_arg (arguments, htri_t *); /* Call private routine */ - if((*ret = H5F_is_hdf5(name)) < 0) + if((*ret = H5F_is_hdf5(name, fapl_id)) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file") break; } @@ -2406,7 +2401,7 @@ H5VL_native_group_create(void *obj, H5VL_loc_params_t loc_params, const char *na HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID") /* get creation properties */ - if(H5P_get(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0) + if(H5P_get(plist, H5VL_PROP_GRP_LCPL_ID, &lcpl_id) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get property value for lcpl id") if(H5G_loc_real(obj, loc_params.obj_type, &loc) < 0) @@ -2545,7 +2540,7 @@ H5VL_native_group_get(void *obj, H5VL_group_get_t get_type, hid_t UNUSED dxpl_id /* Find the group object */ if(H5G_loc_find(&loc, loc_params.loc_data.loc_by_name.name, &grp_loc/*out*/, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found") /* Retrieve the group's information */ @@ -2573,7 +2568,7 @@ H5VL_native_group_get(void *obj, H5VL_group_get_t get_type, hid_t UNUSED dxpl_id loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, &grp_loc/*out*/, - loc_params.loc_data.loc_by_idx.plist_id, + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found") @@ -2662,9 +2657,9 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, void *obj, H5VL_loc void *cur_obj; H5VL_loc_params_t cur_params; - if(H5P_get(plist, H5VL_LINK_TARGET, &cur_obj) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_TARGET, &cur_obj) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for current location id") - if(H5P_get(plist, H5VL_LINK_TARGET_LOC_PARAMS, &cur_params) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &cur_params) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for current name") if(NULL != cur_obj && H5G_loc_real(cur_obj, cur_params.obj_type, &cur_loc) < 0) @@ -2708,7 +2703,7 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, void *obj, H5VL_loc if(H5G_loc_real(obj, loc_params.obj_type, &link_loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object") - if(H5P_get(plist, H5VL_LINK_TARGET_NAME, &target_name) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_TARGET_NAME, &target_name) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for targe name") /* Create the link */ @@ -2727,11 +2722,11 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, void *obj, H5VL_loc if(H5G_loc_real(obj, loc_params.obj_type, &link_loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object") - if(H5P_get(plist, H5VL_LINK_TYPE, &link_type) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_TYPE, &link_type) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for link type") - if(H5P_get(plist, H5VL_LINK_UDATA, &udata) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_UDATA, &udata) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for udata") - if(H5P_get(plist, H5VL_LINK_UDATA_SIZE, &udata_size) < 0) + if(H5P_get(plist, H5VL_PROP_LINK_UDATA_SIZE, &udata_size) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for udata size") /* Create link */ @@ -2847,7 +2842,7 @@ static herr_t H5VL_native_link_iterate(void *obj, H5VL_loc_params_t loc_params, else if(loc_params.type == H5VL_OBJECT_BY_NAME) { if((ret_value = H5G_iterate(&loc, loc_params.loc_data.loc_by_name.name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed") } else { @@ -2868,7 +2863,7 @@ static herr_t H5VL_native_link_iterate(void *obj, H5VL_loc_params_t loc_params, else if(loc_params.type == H5VL_OBJECT_BY_NAME) { if((ret_value = H5G_visit(&loc, loc_params.loc_data.loc_by_name.name, idx_type, order, op, op_data, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed") } else { @@ -2914,7 +2909,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge /* Check for the existence of the link */ if((*ret = H5L_exists(&loc, loc_params.loc_data.loc_by_name.name, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info") break; } @@ -2926,7 +2921,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge /* Get the link information */ if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Lget_info */ if(H5L_get_info(&loc, loc_params.loc_data.loc_by_name.name, linfo, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info") } else if(loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Lget_info_by_idx */ @@ -2939,7 +2934,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge udata.dxpl_id = H5AC_ind_dxpl_id; udata.linfo = linfo; if(H5L_get_info_by_idx(&loc, loc_params.loc_data.loc_by_idx.name, &udata, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info") } else @@ -2965,7 +2960,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge /* Get the link name */ if(H5L_get_name_by_idx(&loc, loc_params.loc_data.loc_by_idx.name, &udata, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info") *ret = udata.name_len; @@ -2980,7 +2975,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge /* Get the link information */ if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Lget_val */ if(H5L_get_val(&loc, loc_params.loc_data.loc_by_name.name, buf, size, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value") } else if(loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Lget_val_by_idx */ @@ -2995,7 +2990,7 @@ H5VL_native_link_get(void *obj, H5VL_loc_params_t loc_params, H5VL_link_get_t ge udata.size = size; if(H5L_get_val_by_idx(&loc, loc_params.loc_data.loc_by_idx.name, &udata, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link val") } else @@ -3043,7 +3038,7 @@ H5VL_native_link_remove(void *obj, H5VL_loc_params_t loc_params, hid_t UNUSED dx /* Unlink */ if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Ldelete */ if(H5L_delete(&loc, loc_params.loc_data.loc_by_name.name, - loc_params.loc_data.loc_by_name.plist_id, H5AC_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "unable to delete link") } else if(loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Ldelete_by_idx */ @@ -3056,7 +3051,7 @@ H5VL_native_link_remove(void *obj, H5VL_loc_params_t loc_params, hid_t UNUSED dx udata.dxpl_id = H5AC_dxpl_id; if(H5L_delete_by_idx(&loc, loc_params.loc_data.loc_by_idx.name, &udata, - loc_params.loc_data.loc_by_idx.plist_id, H5AC_dxpl_id) < 0) + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "unable to delete link") } else @@ -3101,7 +3096,7 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope { /* Open the object */ if((temp_id = H5O_open_name(&loc, loc_params.loc_data.loc_by_name.name, - loc_params.loc_data.loc_by_name.plist_id, TRUE)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, TRUE)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object") break; } @@ -3116,13 +3111,13 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope if(H5G_loc_find_by_idx(&loc, loc_params.loc_data.loc_by_idx.name, loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, - &obj_loc/*out*/, loc_params.loc_data.loc_by_idx.plist_id, + &obj_loc/*out*/, loc_params.loc_data.loc_by_idx.lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "group not found") loc_found = TRUE; /* Open the object */ - if((temp_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_name.plist_id, + if((temp_id = H5O_open_by_loc(&obj_loc, loc_params.loc_data.loc_by_name.lapl_id, H5AC_dxpl_id, TRUE)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object") break; @@ -3154,7 +3149,7 @@ H5VL_native_object_open(void *obj, H5VL_loc_params_t loc_params, H5I_type_t *ope file = loc.oloc->file; /* Create reference */ - if((temp_id = H5R_dereference(file, loc_params.loc_data.loc_by_ref.plist_id, + if((temp_id = H5R_dereference(file, loc_params.loc_data.loc_by_ref.lapl_id, H5AC_dxpl_id, loc_params.loc_data.loc_by_ref.ref_type, loc_params.loc_data.loc_by_ref._ref, @@ -3252,7 +3247,7 @@ static herr_t H5VL_native_object_visit(void *obj, H5VL_loc_params_t loc_params, } else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Ovisit_by_name */ if((ret_value = H5O_visit(&loc, loc_params.loc_data.loc_by_name.name, idx_type, order, - op, op_data, loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id)) < 0) + op, op_data, loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed") } else { @@ -3483,7 +3478,7 @@ H5VL_native_object_misc(void *obj, H5VL_loc_params_t loc_params, H5VL_object_mis else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Arename_by_name */ /* Call attribute rename routine */ if(H5A_rename_by_name(loc, loc_params.loc_data.loc_by_name.name, old_name, - new_name, loc_params.loc_data.loc_by_name.plist_id) < 0) + new_name, loc_params.loc_data.loc_by_name.lapl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute") } else { @@ -3520,7 +3515,7 @@ H5VL_native_object_misc(void *obj, H5VL_loc_params_t loc_params, H5VL_object_mis else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Oset_comment_by_name */ /* (Re)set the object's comment */ if(H5G_loc_set_comment(&loc, loc_params.loc_data.loc_by_name.name, comment, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") } else { @@ -3620,7 +3615,7 @@ H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_ if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* Check if the object exists */ if((*ret = H5G_loc_exists(&loc, loc_params.loc_data.loc_by_name.name, - loc_params.loc_data.loc_by_name.plist_id, H5AC_dxpl_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_dxpl_id)) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", loc_params.loc_data.loc_by_name.name) } @@ -3643,7 +3638,7 @@ H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_ else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Oget_info_by_name */ /* Retrieve the object's information */ if(H5G_loc_info(&loc, loc_params.loc_data.loc_by_name.name, TRUE, obj_info, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") } else if(loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Oget_info_by_idx */ @@ -3661,7 +3656,7 @@ H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_ loc_params.loc_data.loc_by_idx.idx_type, loc_params.loc_data.loc_by_idx.order, loc_params.loc_data.loc_by_idx.n, &obj_loc/*out*/, - loc_params.loc_data.loc_by_idx.plist_id, + loc_params.loc_data.loc_by_idx.lapl_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found") @@ -3695,7 +3690,7 @@ H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_ } else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Oget_comment_by_name */ if((*ret = H5G_loc_get_comment(&loc, loc_params.loc_data.loc_by_name.name, comment/*out*/, bufsize, - loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id)) < 0) + loc_params.loc_data.loc_by_name.lapl_id, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") } else { diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index 0e58014..b2d4dce 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -20,43 +20,36 @@ #ifndef _H5VLpublic_H #define _H5VLpublic_H -#include "stdarg.h" +#include #include "H5public.h" #include "H5Apublic.h" /* Attributes */ -#include "H5Fpublic.h" -#include "H5Lpublic.h" -#include "H5Opublic.h" -#include "H5Rpublic.h" - -/* Asynchronous operation status */ -typedef enum H5ES_status_t { - H5ES_STATUS_IN_PROGRESS, /* Operation has not yet completed */ - H5ES_STATUS_SUCCEED, /* Operation has completed, successfully */ - H5ES_STATUS_FAIL, /* Operation has completed, but failed */ - H5ES_STATUS_CANCEL /* Operation has not completed and has been cancelled */ -} H5ES_status_t; +#include "H5ESpublic.h" /* Event Stack */ +#include "H5Fpublic.h" /* Files */ +#include "H5Lpublic.h" /* Links */ +#include "H5Opublic.h" /* Objects */ +#include "H5Rpublic.h" /* References */ /* Dataset creation property names */ -#define H5VL_DSET_TYPE_ID "dataset_type_id" -#define H5VL_DSET_SPACE_ID "dataset_space_id" -#define H5VL_DSET_LCPL_ID "dataset_lcpl_id" +#define H5VL_PROP_DSET_TYPE_ID "dataset_type_id" +#define H5VL_PROP_DSET_SPACE_ID "dataset_space_id" +#define H5VL_PROP_DSET_LCPL_ID "dataset_lcpl_id" /* Attribute creation property names */ -#define H5VL_ATTR_TYPE_ID "attr_type_id" -#define H5VL_ATTR_SPACE_ID "attr_space_id" -#define H5VL_ATTR_LOC_PARAMS "attr_location" +#define H5VL_PROP_ATTR_TYPE_ID "attr_type_id" +#define H5VL_PROP_ATTR_SPACE_ID "attr_space_id" +#define H5VL_PROP_ATTR_LOC_PARAMS "attr_location" /* Link creation property names */ -#define H5VL_LINK_TARGET "target_location_object" -#define H5VL_LINK_TARGET_LOC_PARAMS "target_params" -#define H5VL_LINK_TARGET_NAME "target_name" -#define H5VL_LINK_TYPE "link type" -#define H5VL_LINK_UDATA "udata" -#define H5VL_LINK_UDATA_SIZE "udata size" +#define H5VL_PROP_LINK_TARGET "target_location_object" +#define H5VL_PROP_LINK_TARGET_LOC_PARAMS "target_params" +#define H5VL_PROP_LINK_TARGET_NAME "target_name" +#define H5VL_PROP_LINK_TYPE "link type" +#define H5VL_PROP_LINK_UDATA "udata" +#define H5VL_PROP_LINK_UDATA_SIZE "udata size" /* Group creation property names */ -#define H5VL_GRP_LCPL_ID "group_lcpl_id" +#define H5VL_PROP_GRP_LCPL_ID "group_lcpl_id" /* types for all attr get API routines */ typedef enum H5VL_attr_get_t { @@ -175,7 +168,7 @@ typedef enum H5VL_loc_type_t { struct H5VL_loc_by_name { const char *name; - hid_t plist_id; + hid_t lapl_id; }; struct H5VL_loc_by_idx { @@ -183,7 +176,7 @@ struct H5VL_loc_by_idx { H5_index_t idx_type; H5_iter_order_t order; hsize_t n; - hid_t plist_id; + hid_t lapl_id; }; struct H5VL_loc_by_addr { @@ -193,7 +186,7 @@ struct H5VL_loc_by_addr { struct H5VL_loc_by_ref { H5R_type_t ref_type; const void *_ref; - hid_t plist_id; + hid_t lapl_id; }; /* Structure to hold parameters for object locations. @@ -358,8 +351,8 @@ H5_DLL herr_t H5VLattr_close(void *attr, H5VL_t *vol_plugin, hid_t dxpl_id, void /* DATASE OBJECT ROUTINES */ H5_DLL void *H5VLdataset_create(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); H5_DLL void *H5VLdataset_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); -H5_DLL herr_t H5VLdataset_read(void *dset, H5VL_t *vol_plugin, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf, void **req); -H5_DLL herr_t H5VLdataset_write(void *dset, H5VL_t *vol_plugin, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf, void **req); +H5_DLL herr_t H5VLdataset_read(void *dset, H5VL_t *vol_plugin, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf, void **req); +H5_DLL herr_t H5VLdataset_write(void *dset, H5VL_t *vol_plugin, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, void **req); H5_DLL herr_t H5VLdataset_set_extent(void *dset, H5VL_t *vol_plugin, const hsize_t size[], hid_t dxpl_id, void **req); H5_DLL herr_t H5VLdataset_get(void *dset, H5VL_t *vol_plugin, H5VL_dataset_get_t get_type, hid_t dxpl_id, void **req, va_list arguments); H5_DLL herr_t H5VLdataset_close(void *dset, H5VL_t *vol_plugin, hid_t dxpl_id, void **req); diff --git a/src/Makefile.am b/src/Makefile.am index f021b7c..11525fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -114,7 +114,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5version.h \ H5Apublic.h H5ACpublic.h \ H5Cpublic.h H5Dpublic.h \ - H5Epubgen.h H5Epublic.h H5Fpublic.h \ + H5Epubgen.h H5Epublic.h H5ESpublic.h H5Fpublic.h \ H5FDpublic.h H5FDcore.h H5FDdirect.h \ H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h \ H5FDmulti.h H5FDsec2.h H5FDstdio.h \ diff --git a/src/Makefile.in b/src/Makefile.in index f32ba42..5324048 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -821,7 +821,7 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5version.h \ H5Apublic.h H5ACpublic.h \ H5Cpublic.h H5Dpublic.h \ - H5Epubgen.h H5Epublic.h H5Fpublic.h \ + H5Epubgen.h H5Epublic.h H5ESpublic.h H5Fpublic.h \ H5FDpublic.h H5FDcore.h H5FDdirect.h \ H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h \ H5FDmulti.h H5FDsec2.h H5FDstdio.h \ -- cgit v0.12