diff options
| author | John Mainzer <mainzer@hdfgroup.org> | 2011-05-03 22:12:22 (GMT) |
|---|---|---|
| committer | John Mainzer <mainzer@hdfgroup.org> | 2011-05-03 22:12:22 (GMT) |
| commit | 92b272cf1f7b56a28ab0a596fb729ab0580e5a5d (patch) | |
| tree | 546fcd7cff89e489baa4ed32fb9ea1bbb08e3e12 /src/H5FDfamily.c | |
| parent | 9bb32f649461bcbe7efd0a9fed8b921a8b2309ef (diff) | |
| parent | db8ff8e4ec578d5f90f04355daf30aef61f58e69 (diff) | |
| download | hdf5-92b272cf1f7b56a28ab0a596fb729ab0580e5a5d.zip hdf5-92b272cf1f7b56a28ab0a596fb729ab0580e5a5d.tar.gz hdf5-92b272cf1f7b56a28ab0a596fb729ab0580e5a5d.tar.bz2 | |
[svn-r20716] Updated from trunk and resolved conflicts.
tested on phoenix (serial -- with and without aio)
jam (serial -- gcc, intel, and PGI compiler, with and without aio)
Diffstat (limited to 'src/H5FDfamily.c')
| -rw-r--r-- | src/H5FDfamily.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 3e09e2f..3389d57 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -162,6 +162,7 @@ typedef struct H5FD_family_dxpl_t { } H5FD_family_dxpl_t; /* Callback prototypes */ +static herr_t H5FD_family_term(void); static void *H5FD_family_fapl_get(H5FD_t *_file); static void *H5FD_family_fapl_copy(const void *_old_fa); static herr_t H5FD_family_fapl_free(void *_fa); @@ -217,6 +218,7 @@ static const H5FD_private_class_t H5FD_family_g = { "family", /*name */ HADDR_MAX, /*maxaddr */ H5F_CLOSE_WEAK, /*fc_degree */ + H5FD_family_term, /*terminate */ H5FD_family_sb_size, /*sb_size */ H5FD_family_sb_encode, /*sb_encode */ H5FD_family_sb_decode, /*sb_decode */ @@ -332,16 +334,14 @@ done: * * Purpose: Shut down the VFD * - * Return: <none> + * Returns: Non-negative on success or negative on failure * * Programmer: Quincey Koziol * Friday, Jan 30, 2004 * - * Modification: - * *--------------------------------------------------------------------------- */ -void +static herr_t H5FD_family_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_term) @@ -349,7 +349,7 @@ H5FD_family_term(void) /* Reset VFL ID */ H5FD_FAMILY_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_family_term() */ @@ -1077,18 +1077,18 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2) { const H5FD_family_t *f1 = (const H5FD_family_t*)_f1; const H5FD_family_t *f2 = (const H5FD_family_t*)_f2; - int ret_value=(H5FD_VFD_DEFAULT); + int ret_value = 0; - FUNC_ENTER_NOAPI(H5FD_family_cmp, H5FD_VFD_DEFAULT) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_cmp) - assert(f1->nmembs>=1 && f1->memb[0]); - assert(f2->nmembs>=1 && f2->memb[0]); + HDassert(f1->nmembs >= 1 && f1->memb[0]); + HDassert(f2->nmembs >= 1 && f2->memb[0]); - ret_value= H5FDcmp(f1->memb[0], f2->memb[0]); + ret_value = H5FDcmp(f1->memb[0], f2->memb[0]); done: FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5FD_family_cmp() */ /*------------------------------------------------------------------------- |