summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5A.c4
-rw-r--r--src/H5D.c4
-rw-r--r--src/H5F.c2
-rw-r--r--src/H5G.c16
-rw-r--r--src/H5R.c4
-rw-r--r--src/H5T.c6
6 files changed, 18 insertions, 18 deletions
diff --git a/src/H5A.c b/src/H5A.c
index 31530cb..3c89184 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -1113,7 +1113,7 @@ H5Aget_num_attrs(hid_t loc_id)
}
/* Look up the attribute for the object */
- ret_value=H5O_count(ent, H5O_ATTR, H5AC_dxpl_id);
+ ret_value=H5O_count(ent, H5O_ATTR, H5AC_ind_dxpl_id);
done:
FUNC_LEAVE_API(ret_value);
@@ -1158,7 +1158,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
done:
FUNC_LEAVE_API(ret_value);
-}
+} /* H5Arename() */
/*-------------------------------------------------------------------------
diff --git a/src/H5D.c b/src/H5D.c
index ec9dbfb..90d64af 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -980,7 +980,7 @@ herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
/* Read data space address and return */
- if(FAIL==(ret_value=H5D_get_space_status(dset, allocation, H5AC_dxpl_id)))
+ if(FAIL==(ret_value=H5D_get_space_status(dset, allocation, H5AC_ind_dxpl_id)))
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get space status");
done:
@@ -3638,7 +3638,7 @@ H5Dget_storage_size(hid_t dset_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a dataset");
/* Set return value */
- ret_value = H5D_get_storage_size(dset,H5AC_dxpl_id);
+ ret_value = H5D_get_storage_size(dset,H5AC_ind_dxpl_id);
done:
FUNC_LEAVE_API(ret_value);
diff --git a/src/H5F.c b/src/H5F.c
index 3ca2c30..5e2f473 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1390,7 +1390,7 @@ H5Fis_hdf5(const char *name)
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 */
- ret_value = (HADDR_UNDEF!=H5F_locate_signature(file, H5AC_dxpl_id));
+ ret_value = (HADDR_UNDEF!=H5F_locate_signature(file, H5AC_ind_dxpl_id));
done:
/* Close the file */
diff --git a/src/H5G.c b/src/H5G.c
index 9e7095b..fe70e64 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -424,7 +424,7 @@ H5Gget_num_objs(hid_t group_id, hsize_t *num_objs)
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "nil pointer");
/* Call private function. */
- ret_value = H5G_get_num_objs(group, num_objs, H5AC_dxpl_id);
+ ret_value = H5G_get_num_objs(group, num_objs, H5AC_ind_dxpl_id);
done:
FUNC_LEAVE_API(ret_value);
@@ -471,13 +471,13 @@ H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char *name, size_t size)
if (!name)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "nil pointer for name");
- if (H5G_get_num_objs(group, &num_objs, H5AC_dxpl_id)<0)
+ if (H5G_get_num_objs(group, &num_objs, H5AC_ind_dxpl_id)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to retrieve number of members");
if(idx >= num_objs)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound");
/*call private function*/
- ret_value = H5G_get_objname_by_idx(group, idx, name, size, H5AC_dxpl_id);
+ ret_value = H5G_get_objname_by_idx(group, idx, name, size, H5AC_ind_dxpl_id);
done:
FUNC_LEAVE_API(ret_value);
@@ -515,13 +515,13 @@ H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
if (NULL==(group = H5I_object_verify(group_id,H5I_GROUP)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
- if (H5G_get_num_objs(group, &num_objs, H5AC_dxpl_id)<0)
+ if (H5G_get_num_objs(group, &num_objs, H5AC_ind_dxpl_id)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to retrieve number of members");
if(idx >= num_objs)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound");
/*call private function*/
- ret_value = H5G_get_objtype_by_idx(group, idx, H5AC_dxpl_id);
+ ret_value = H5G_get_objtype_by_idx(group, idx, H5AC_ind_dxpl_id);
done:
FUNC_LEAVE_API(ret_value);
@@ -736,7 +736,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
/* Get info */
- if (H5G_get_objinfo (loc, name, follow_link, statbuf, H5AC_dxpl_id)<0)
+ if (H5G_get_objinfo (loc, name, follow_link, statbuf, H5AC_ind_dxpl_id)<0)
HGOTO_ERROR (H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object");
done:
@@ -778,7 +778,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
/* Get the link value */
- if (H5G_linkval (loc, name, size, buf, H5AC_dxpl_id)<0)
+ if (H5G_linkval (loc, name, size, buf, H5AC_ind_dxpl_id)<0)
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value");
done:
@@ -864,7 +864,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
if (bufsize>0 && !buf)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified");
- if ((ret_value=H5G_get_comment(loc, name, bufsize, buf, H5AC_dxpl_id))<0)
+ if ((ret_value=H5G_get_comment(loc, name, bufsize, buf, H5AC_ind_dxpl_id))<0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value");
done:
diff --git a/src/H5R.c b/src/H5R.c
index 64fdb6a..361e11d 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -611,7 +611,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, void *_ref)
file=loc->file;
/* Get the dataspace with the correct region selected */
- if ((space=H5R_get_region(file,H5AC_dxpl_id,ref_type,_ref))==NULL)
+ if ((space=H5R_get_region(file,H5AC_ind_dxpl_id,ref_type,_ref))==NULL)
HGOTO_ERROR (H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create dataspace");
/* Atomize */
@@ -869,7 +869,7 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
file=loc->file;
/* Get the object information */
- if ((ret_value=H5R_get_obj_type(file,H5AC_dxpl_id,ref_type,_ref))<0)
+ if ((ret_value=H5R_get_obj_type(file,H5AC_ind_dxpl_id,ref_type,_ref))<0)
HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
done:
diff --git a/src/H5T.c b/src/H5T.c
index 80a4831..86a3876 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -5910,7 +5910,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no conversion function specified");
/* Go register the function */
- if(H5T_register(pers,name,src,dst,func,H5AC_dxpl_id)<0)
+ if(H5T_register(pers,name,src,dst,func,H5AC_ind_dxpl_id)<0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register conversion function");
done:
@@ -6040,7 +6040,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
if (dst_id>0 && (NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE))))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "dst is not a data type");
- if (H5T_unregister(pers,name,src,dst,func,H5AC_dxpl_id)<0)
+ if (H5T_unregister(pers,name,src,dst,func,H5AC_ind_dxpl_id)<0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "internal unregister function failed");
done:
@@ -6086,7 +6086,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "no address to receive cdata pointer");
/* Find it */
- if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_dxpl_id)))
+ if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id)))
HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "conversion function not found");
if (pcdata)