From eee4741a2f388ee543a059b540f799a564724823 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 29 Apr 2015 15:24:56 -0500 Subject: [svn-r26971] fixed declaration of h5ltget_attribute_c --- hl/fortran/src/H5LTf90proto.h | 2 +- hl/fortran/src/H5LTfc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index 834e63a..6234635 100644 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -107,7 +107,7 @@ h5ltget_attribute_c(hid_t_f *loc_id, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname, - void *buf, char* dtype); + void *buf, char* dtype, size_t_f *sizeof_val); HDF5_HL_F90CSTUBDLL int_f diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c index dc3c7b9..7f52eb2 100644 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -598,7 +598,7 @@ h5ltget_attribute_c(hid_t_f *loc_id, _fcd dsetname, size_t_f *attrnamelen, _fcd attrname, - void *buf, char *dtype, size_t_f *size_f) + void *buf, char *dtype, size_t_f *sizeof_val) { int ret_value = -1; herr_t ret; @@ -623,18 +623,18 @@ h5ltget_attribute_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; if( HDstrncmp(dtype,"I",1) == 0) { - if((size_t)*size_f == sizeof(int)) + if((size_t)*sizeof_val == sizeof(int)) ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_INT,buf); - else if ((size_t)*size_f == sizeof(long)) + else if ((size_t)*sizeof_val == sizeof(long)) ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_LONG,buf); - else if ((size_t)*size_f == sizeof(long long)) + else if ((size_t)*sizeof_val == sizeof(long long)) ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_LLONG,buf); else goto done; } else if ( HDstrncmp(dtype,"R",1) == 0 ) { - if((size_t)*size_f == sizeof(float)) + if((size_t)*sizeof_val == sizeof(float)) ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_FLOAT,buf); - else if((size_t)*size_f == sizeof(double)) + else if((size_t)*sizeof_val == sizeof(double)) ret = H5LTget_attribute(c_loc_id,c_name,c_attrname,H5T_NATIVE_DOUBLE,buf); else goto done; -- cgit v0.12