summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-08-11 02:47:13 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-08-11 02:47:13 (GMT)
commit80c02cc6f1ba4e4c564a862c24029c1230a5835d (patch)
tree364700509dfbdcbacf90577d551baa3864a800c1 /fortran
parentd24ae52673e96864f4e406dd7b277f91d42fbb38 (diff)
downloadhdf5-80c02cc6f1ba4e4c564a862c24029c1230a5835d.zip
hdf5-80c02cc6f1ba4e4c564a862c24029c1230a5835d.tar.gz
hdf5-80c02cc6f1ba4e4c564a862c24029c1230a5835d.tar.bz2
[svn-r4327] Purpose:
More code cleanups Description: Wrap up the code cleanups for changing the dataset transfer property lists over to using the generic property list code. Platforms tested: IRIX64 6.5 (modi4)
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Pf.c17
-rw-r--r--fortran/src/H5_f.c2
2 files changed, 13 insertions, 6 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 3dc401f..fed1249 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -50,7 +50,10 @@ nh5pcreate_c ( int_f *classtype, hid_t_f *prp_id )
return ret_value;
}
*/
- c_prp_id = H5Pcreate(c_classtype);
+ if (H5I_GENPROP_CLS == H5Iget_type((hid_t)*classtype))
+ c_prp_id = H5Pcreate_list((hid_t)*classtype);
+ else
+ c_prp_id = H5Pcreate(c_classtype);
if ( c_prp_id < 0 ) ret_value = -1;
*prp_id = (hid_t_f)c_prp_id;
@@ -71,10 +74,13 @@ int_f
nh5pclose_c ( hid_t_f *prp_id )
{
int ret_value = 0;
- hid_t c_prp_id;
+ hid_t c_prp_id=(*prp_id);
- c_prp_id = *prp_id;
- if ( H5Pclose(c_prp_id) < 0 ) ret_value = -1;
+ if (H5I_GENPROP_LST == H5Iget_type(c_prp_id)) {
+ if ( H5Pclose_list(c_prp_id) < 0 ) ret_value = -1;
+ } else {
+ if ( H5Pclose(c_prp_id) < 0 ) ret_value = -1;
+ }
return ret_value;
}
@@ -1133,7 +1139,8 @@ nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_
int ret_value = -1;
hid_t c_prp_id;
herr_t ret;
- int c_mdc_nelmts, c_rdcc_nelmts;
+ int c_mdc_nelmts;
+ size_t c_rdcc_nelmts;
size_t c_rdcc_nbytes;
hid_t c_memb_plist;
double c_rdcc_w0;
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 83eb113..b3f1a6c 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -248,7 +248,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, int_f *h5f_flags,
h5p_flags[0] = H5P_FILE_CREATE;
h5p_flags[1] = H5P_FILE_ACCESS;
h5p_flags[2] = H5P_DATASET_CREATE;
- h5p_flags[3] = H5P_DATASET_XFER;
+ h5p_flags[3] = H5P_DATASET_XFER_NEW;
h5p_flags[4] = H5P_MOUNT;
h5p_flags[5] = H5P_DEFAULT;