diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-09-13 17:08:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-09-13 17:08:01 (GMT) |
| commit | 602c716f76f3d4623ac24419dd8419a2a1817aaa (patch) | |
| tree | 145b2ec66dfa8923e06c96a574e5d9fa8c650d32 /src/H5Plapl.c | |
| parent | 0ffdaff795a6811146b86e14b40f7aa57b0ce39d (diff) | |
| download | hdf5-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/H5Plapl.c')
| -rw-r--r-- | src/H5Plapl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/H5Plapl.c b/src/H5Plapl.c index 8d8ee15..0697130 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -48,6 +48,7 @@ /* Definitions for number of soft links to traverse */ #define H5L_ACS_NLINKS_SIZE sizeof(size_t) #define H5L_ACS_NLINKS_DEF H5L_NUM_LINKS /*max symlinks to follow per lookup */ + /* Definitions for external link prefix */ #define H5L_ACS_ELINK_PREFIX_SIZE sizeof(char *) #define H5L_ACS_ELINK_PREFIX_DEF NULL /*default is no prefix */ @@ -297,8 +298,12 @@ H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t UNUSED si /* Check for NULL property lists */ if(obj1 == NULL && obj2 != NULL) HGOTO_DONE(1); if(obj1 != NULL && obj2 == NULL) HGOTO_DONE(-1); - if(obj1 && obj2) - ret_value = H5P_cmp_plist(obj1, obj2); + if(obj1 && obj2) { + herr_t status; + + status = H5P_cmp_plist(obj1, obj2, &ret_value); + HDassert(status >= 0); + } /* end if */ done: FUNC_LEAVE_NOAPI(ret_value) |