diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2012-06-23 23:31:40 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2012-06-23 23:31:40 (GMT) |
| commit | 24b1316f8b91a4ac2fd27668c56a96b04412c191 (patch) | |
| tree | bd8bf0dbf6c5d1933088576f7c3e39fc3a4fb5d5 | |
| parent | b608652f7e6469550a5c7433ca8c3186ec26b7c3 (diff) | |
| download | hdf5-24b1316f8b91a4ac2fd27668c56a96b04412c191.zip hdf5-24b1316f8b91a4ac2fd27668c56a96b04412c191.tar.gz hdf5-24b1316f8b91a4ac2fd27668c56a96b04412c191.tar.bz2 | |
[svn-r22482] Maintenance:
- Fixed a typo in return value of the nh5dread_f_c function ( was 1
instead of 0 on success); fixed the return value to make it consistent
with other Fortran functions; cleaned the code from debug statements.
Platforms tested: jam with GNU and Intel compilers, fortran 2003 feature.
| -rw-r--r-- | fortran/src/H5Df.c | 24 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 6 |
2 files changed, 7 insertions, 23 deletions
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c index e1aa98e..ab7adf7 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -2401,16 +2401,6 @@ nh5dread_f_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t c_xfer_prp; herr_t status; -/* int i, j; */ -/* typedef struct { */ -/* int x; */ -/* float y; */ -/* } r_dual_c; */ - -/* r_dual_c *name=buf; */ - -/* r_dual_c access[4][4]; */ - c_dset_id = (hid_t)*dset_id; c_mem_type_id = (hid_t)*mem_type_id; c_mem_space_id = (hid_t)*mem_space_id; @@ -2419,22 +2409,10 @@ nh5dread_f_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_space_id, /* * Call H5Dread function. */ - -/* printf("%i %i %i %i %i \n",c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp); */ - status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf); if ( status < 0 ) return ret_value; -/* for ( i=0; i<4; ++i) */ -/* for (j = 0; j<4; ++j) { */ -/* access[i][j] = name[i*4+j]; */ -/* /\* access[i].x = access[i].x + 1; *\/ */ -/* printf("x = %i \n", access[i][j].x); */ -/* printf("y = %f \n", access[i][j].y); */ -/* } */ - - - ret_value = 1; + ret_value = 0; return ret_value; } /****if* H5Df/nh5dget_access_plist_c diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 93d2dd1..bfce039 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -693,6 +693,12 @@ Bug Fixes since HDF5-1.8.0 release (ADB - 2011/08/15) - perf_serial test added to Windows projects and check batch file. (ADB - 2009/06/11) + Fortran + -------- + - Fixed a typo in return value of the nh5dread_f_c function ( was 1 + instead of 0 on success); fixed the return value to make it consistent + with other Fortran functions; cleaned the code from debug statements. + (EIP - 2012/06/23) Tools ----- |