diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-23 21:23:39 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-23 21:23:39 (GMT) |
| commit | ce632854c3d542a22018221be1ec47cdad0affe2 (patch) | |
| tree | 29b27353a506fe871196a1bad0bc01077ba8e934 /fortran/src/H5Ff.c | |
| parent | 9630bfd9749c6a8f470325bb762e64835c3192e9 (diff) | |
| download | hdf5-ce632854c3d542a22018221be1ec47cdad0affe2.zip hdf5-ce632854c3d542a22018221be1ec47cdad0affe2.tar.gz hdf5-ce632854c3d542a22018221be1ec47cdad0affe2.tar.bz2 | |
[svn-r26547] Merged changes from the trunk into the branch:
svn merge -r26029:26536 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested: h5committest
Diffstat (limited to 'fortran/src/H5Ff.c')
| -rw-r--r-- | fortran/src/H5Ff.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c index 7455fca..1696672 100644 --- a/fortran/src/H5Ff.c +++ b/fortran/src/H5Ff.c @@ -632,7 +632,7 @@ nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen) /* * Call H5Fget_name function */ - if ((size_c = (size_t_f)H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen)) < 0) + if ((size_c = H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen)) < 0) HGOTO_DONE(FAIL); /* @@ -703,13 +703,16 @@ h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f /******/ { herr_t ret_value=0; /* Return value */ - + ssize_t c_buf_req; /* * Call h5fget_file_image function */ - if ((*buf_req = (size_t_f)H5Fget_file_image((hid_t)*file_id, buf_ptr, (size_t)*buf_len)) < 0) + + if ( (c_buf_req = H5Fget_file_image((hid_t)*file_id, buf_ptr, (size_t)*buf_len)) < 0) HGOTO_DONE(FAIL); + *buf_req = (size_t_f)c_buf_req; + done: return ret_value; } |