summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2009-09-25 19:15:58 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2009-09-25 19:15:58 (GMT)
commit858c8af18fe41b9fc994773334c0375687004faf (patch)
treed321d9922a83a71449649d84dae8b57490eed493
parentca0268116eb9fcf47719a54414d3803abe0ec6ca (diff)
downloadhdf5-858c8af18fe41b9fc994773334c0375687004faf.zip
hdf5-858c8af18fe41b9fc994773334c0375687004faf.tar.gz
hdf5-858c8af18fe41b9fc994773334c0375687004faf.tar.bz2
[svn-r17536] Purpose: Fix bug 1620
Description: H5Ppublic.h listed H5Pget_filter_by_id1 and H5Pget_filter_by_id2 as returning H5Z_filter_t, when in fact they return herr_t. The header file has been corrected to indicate that they return herr_t. Tested: jam
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5Ppublic.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 7ec7a5a..48a2a25 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -106,6 +106,8 @@ Bug Fixes since HDF5-1.8.3
Library
-------
+ - Fixed incorrect return value for H5Pget_filter_by_id1/2 in H5Ppublic.h.
+ NAF - 2009/09/25 - 1620
- Fixed a bug where properties weren't being compared with the registered
compare callback. NAF - 2009/09/25 - 1555
- Corrected problem where library would re-write the superblock in a file
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index a67ea71..495ba42 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -292,7 +292,7 @@ H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned filter,
unsigned cd_values[]/*out*/,
size_t namelen, char name[],
unsigned *filter_config /*out*/);
-H5_DLL H5Z_filter_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id,
+H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id,
unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/,
unsigned *filter_config/*out*/);
@@ -419,7 +419,7 @@ H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size,
H5_DLL H5Z_filter_t H5Pget_filter1(hid_t plist_id, unsigned filter,
unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
unsigned cd_values[]/*out*/, size_t namelen, char name[]);
-H5_DLL H5Z_filter_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
+H5_DLL herr_t H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id,
unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/);