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/H5FDlog.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/H5FDlog.c')
| -rw-r--r-- | src/H5FDlog.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index f7eb349..051195e 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -801,22 +801,20 @@ done: static herr_t H5FD_log_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) { - herr_t ret_value=SUCCEED; - - FUNC_ENTER_NOAPI(H5FD_log_query, FAIL) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_query) /* Set the VFL feature flags that this driver supports */ if(flags) { *flags = 0; - *flags|=H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */ - *flags|=H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */ - *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */ - *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ - } + *flags |= H5FD_FEAT_AGGREGATE_METADATA; /* OK to aggregate metadata allocations */ + *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */ + *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */ + *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */ + *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE; /* VFD handle is POSIX I/O call compatible */ + } /* end if */ -done: - FUNC_LEAVE_NOAPI(ret_value) -} + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5FD_log_query() */ /*------------------------------------------------------------------------- |