diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 14:20:41 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 14:20:41 (GMT) |
| commit | c909c5e7cf43828027e52a21b2dbea220134586b (patch) | |
| tree | 9b3365e02a583c92d09b59dc77b8e771bb31fa79 /src/H5FD.c | |
| parent | b4b16947b781c8e14c3ed874bb082cd76ecc2292 (diff) | |
| download | hdf5-c909c5e7cf43828027e52a21b2dbea220134586b.zip hdf5-c909c5e7cf43828027e52a21b2dbea220134586b.tar.gz hdf5-c909c5e7cf43828027e52a21b2dbea220134586b.tar.bz2 | |
[svn-r17941] Description:
Bring r17939 from trunk to 1.8 branch:
Handle external links from symlinked files by adding another check to
look for "child" files for links from the actual location of the "parent" file,
instead of from the location of the symlink.
Tested on:
FreeBSD/32 6.3 (duty)
(h5committested on trunk)
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: |