diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-14 13:39:36 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-14 13:39:36 (GMT) |
commit | 2f910f3fc770cfe9463bbdaa5a5c857e82acf324 (patch) | |
tree | 42cdaeded703853c3a94f0901d8ebdcf5fb96fcf /src/H5FDfamily.c | |
parent | 8a6d7d14f6f947dd4eacdfff6c86a23d8cb7be95 (diff) | |
download | hdf5-2f910f3fc770cfe9463bbdaa5a5c857e82acf324.zip hdf5-2f910f3fc770cfe9463bbdaa5a5c857e82acf324.tar.gz hdf5-2f910f3fc770cfe9463bbdaa5a5c857e82acf324.tar.bz2 |
[svn-r15863] Description:
Bring r15861 back from trunk to 1.8 release branch.
Tested on:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, 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 production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5FDfamily.c')
-rw-r--r-- | src/H5FDfamily.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 3e09f76..cfad5e3 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -128,6 +128,7 @@ static const H5FD_class_t H5FD_family_g = { H5FD_family_close, /*close */ H5FD_family_cmp, /*cmp */ H5FD_family_query, /*query */ + NULL, /*get_type_map */ NULL, /*alloc */ NULL, /*free */ H5FD_family_get_eoa, /*get_eoa */ @@ -976,22 +977,22 @@ done: static herr_t H5FD_family_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) { - herr_t ret_value=SUCCEED; + herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5FD_family_query, FAIL) /* 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 = 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 */ + } /* end if */ done: FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5FD_family_query() */ /*------------------------------------------------------------------------- @@ -1372,35 +1373,32 @@ done: * Purpose: Flushes all family members. * * Return: Success: 0 - * * Failure: -1, as many files flushed as possible. * * Programmer: Robb Matzke * Wednesday, August 4, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) { H5FD_family_t *file = (H5FD_family_t*)_file; - unsigned u, nerrors=0; - herr_t ret_value=SUCCEED; /* Return value */ + unsigned u, nerrors = 0; + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5FD_family_flush, FAIL) - for (u=0; u<file->nmembs; u++) - if (file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing)<0) + for(u = 0; u < file->nmembs; u++) + if(file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing) < 0) nerrors++; - if (nerrors) + if(nerrors) HGOTO_ERROR(H5E_IO, H5E_BADVALUE, FAIL, "unable to flush member files") done: FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5FD_family_flush() */ /*------------------------------------------------------------------------- |