summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-09-14 01:52:38 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-09-14 01:52:38 (GMT)
commit94153c6c3d776ac172f5151155acee6b64131526 (patch)
tree456c655e4a1cb0931956b5a961d4f8e805c40578 /fortran/src
parentbe12aa63a0a210da111b0d31dde44c2c665c7165 (diff)
downloadhdf5-94153c6c3d776ac172f5151155acee6b64131526.zip
hdf5-94153c6c3d776ac172f5151155acee6b64131526.tar.gz
hdf5-94153c6c3d776ac172f5151155acee6b64131526.tar.bz2
[svn-r14148] Description:
Add H5Rget_obj_type() to the API versioning and switch internal routines to use H5Rget_obj_type2() Misc. other code cleanups, etc. Tested on: FreeBSD/32 6.2 (duty) FreeBSD/64 6.2 (liberty) Linux/32 2.6 (kagiso) Linux/64 2.6 (smirom) AIX/32 5.3 (copper) Solaris/32 2.10 (linew) Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5Rf.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index f917a88..4430e1a 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -220,20 +220,22 @@ nh5rget_region_region_c (hid_t_f *dset_id, int_f *ref, hid_t_f *space_id)
int_f
nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
{
- int ret_value = -1;
- hid_t c_dset_id;
- int c_obj_type;
+ H5O_type_t c_obj_type;
hobj_ref_t ref_c;
+ int_f ret_value = -1;
- ref_c=*ref;
+ ref_c = *ref;
/*
* Call H5Rget_object_type function.
*/
- c_dset_id = *dset_id;
- c_obj_type = H5Rget_obj_type(c_dset_id, H5R_OBJECT, &ref_c);
- if(c_obj_type < 0) return ret_value;
+ if(H5Rget_obj_type2((hid_t)*dset_id, H5R_OBJECT, &ref_c, &c_obj_type) < 0)
+ return ret_value;
+
*obj_type = (int_f)c_obj_type;
+
ret_value = 0;
+
return ret_value;
}
+