summaryrefslogtreecommitdiffstats
path: root/src/H5P.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-09-13 17:08:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-09-13 17:08:01 (GMT)
commit602c716f76f3d4623ac24419dd8419a2a1817aaa (patch)
tree145b2ec66dfa8923e06c96a574e5d9fa8c650d32 /src/H5P.c
parent0ffdaff795a6811146b86e14b40f7aa57b0ce39d (diff)
downloadhdf5-602c716f76f3d4623ac24419dd8419a2a1817aaa.zip
hdf5-602c716f76f3d4623ac24419dd8419a2a1817aaa.tar.gz
hdf5-602c716f76f3d4623ac24419dd8419a2a1817aaa.tar.bz2
[svn-r22758] Description:
Bring generic improvements from encode/decode property list branch to the trunk. This includes a better version of the property list comparison routine, cleaned up compiler warnings, and some cleaned up property list callbacks. Also, started on changes to clean up parallel test output, so that it doesn't report successful tests from each process. Tested on: Mac OSX/64 10.7.4 (amazon) w/debug, GCC 4.7.x, FORTRAN, C++, threadsafe and parallel Linux 2.6/32 (jam) w/debug Solaris 2.7/64 (linew) w/debug
Diffstat (limited to 'src/H5P.c')
-rw-r--r--src/H5P.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/H5P.c b/src/H5P.c
index ba286fb..c7ed30b 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -990,8 +990,13 @@ H5Pequal(hid_t id1, hid_t id2)
/* Compare property lists */
if(H5I_GENPROP_LST == H5I_get_type(id1)) {
- if(H5P_cmp_plist((const H5P_genplist_t *)obj1, (const H5P_genplist_t *)obj2) == 0)
- ret_value = TRUE;
+ int cmp_ret = 0;
+
+ if(H5P_cmp_plist((const H5P_genplist_t *)obj1, (const H5P_genplist_t *)obj2, &cmp_ret) < 0)
+ HGOTO_ERROR(H5E_PLIST, H5E_CANTCOMPARE, FAIL, "can't compare property lists")
+
+ /* Set return value */
+ ret_value = cmp_ret == 0 ? TRUE : FALSE;
} /* end if */
/* Must be property classes */
else {
@@ -1062,6 +1067,7 @@ done:
void *udata; IN/OUT: Pointer to iteration data from user
RETURNS
Success: Returns the return value of the last call to ITER_FUNC
+ Failure: negative value
DESCRIPTION
This routine calls the actual callback routine for the property in the
property list or class.