diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-09-17 17:03:42 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-09-17 17:03:42 (GMT) |
| commit | c0bb2c979bdff34fd15534034d1de48388fdf90e (patch) | |
| tree | 8effa84e4751284ca513da6ad4eed1128710936d /fortran/src/H5Lf.c | |
| parent | 7dc63bdf270925373cff2951f7303fddb74e6a16 (diff) | |
| download | hdf5-c0bb2c979bdff34fd15534034d1de48388fdf90e.zip hdf5-c0bb2c979bdff34fd15534034d1de48388fdf90e.tar.gz hdf5-c0bb2c979bdff34fd15534034d1de48388fdf90e.tar.bz2 | |
[svn-r17486] Description:
Merged changes in the trunk/fortran to 1.8.
svn merge -r 17222:17485 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Brings bugfixes into 1.8 for:
Bug [1652] h5lget_info_by_idx_f missing/broken functionality
and
Bug [1653] H5_LINK_* values defined in H5f90global.f90 are incorrect
Tested: jam (ifort)
smirom (gfortran)
linew (f90)
Diffstat (limited to 'fortran/src/H5Lf.c')
| -rw-r--r-- | fortran/src/H5Lf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c index 4378f33..2832d44 100644 --- a/fortran/src/H5Lf.c +++ b/fortran/src/H5Lf.c @@ -396,7 +396,7 @@ done: int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, - int_f *address, hsize_t_f *val_size, + haddr_t_f *address, size_t_f *val_size, hid_t_f *lapl_id) { char *c_link_name = NULL; /* Buffer to hold C string */ @@ -421,8 +421,8 @@ nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, *corder_valid = 0; if(link_buff.corder_valid > 0) *corder_valid = 1; *link_type = (int_f)link_buff.type; - *address = (int_f)link_buff.u.address; - *val_size = (hsize_t)link_buff.u.val_size; + *address = (haddr_t_f)link_buff.u.address; + *val_size = (size_t_f)link_buff.u.val_size; done: return ret_value; @@ -453,7 +453,7 @@ done: int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *index_field, int_f *order, hsize_t_f *n, - int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id) + int_f *link_type, int_f *corder_valid, int_f *corder, int_f *cset, haddr_t_f *address, size_t_f *val_size, hid_t_f *lapl_id) { char *c_group_name = NULL; /* Buffer to hold C string */ H5_index_t c_index_field; @@ -483,7 +483,9 @@ nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, *corder = (int_f)link_buff.corder; *cset = (int_f)link_buff.cset; - *data_size = (hsize_t)link_buff.u.val_size; + *link_type = (int_f)link_buff.type; + *address = (haddr_t_f)link_buff.u.address; + *val_size = (size_t_f)link_buff.u.val_size; done: return ret_value; |