diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 18:34:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 18:34:23 (GMT) |
| commit | a4750dfae7e187f95c4515939968e6fce880efed (patch) | |
| tree | 0fc33c6dda70c952d83759c937ff3bf9499aaa86 /src/H5FD.c | |
| parent | dfd01b8331fd3173c396c1ec3e6523db8a8adb9e (diff) | |
| download | hdf5-a4750dfae7e187f95c4515939968e6fce880efed.zip hdf5-a4750dfae7e187f95c4515939968e6fce880efed.tar.gz hdf5-a4750dfae7e187f95c4515939968e6fce880efed.tar.bz2 | |
[svn-r17946] Description:
Bring r17899:17945 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5FD.c')
| -rw-r--r-- | src/H5FD.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2036,8 +2036,6 @@ done: * Programmer: Raymond Lu * Sep. 16, 2002 * - * Modifications: - * *-------------------------------------------------------------------------- */ herr_t @@ -2047,11 +2045,13 @@ H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle) FUNC_ENTER_NOAPI(H5FD_get_vfd_handle, FAIL) + /* Sanity check */ + HDassert(file); HDassert(file_handle); if(NULL == file->cls->get_handle) HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "file driver has no `get_vfd_handle' method") - if((ret_value = file->cls->get_handle(file, fapl, file_handle)) < 0) + if((file->cls->get_handle)(file, fapl, file_handle) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get file handle for file driver") done: |