diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-21 13:55:52 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-21 13:55:52 (GMT) |
| commit | 8a5e400fda99c06a930e7acdcbe6afad7f1f57dc (patch) | |
| tree | 0ed4c63e67abe9d143de59756716d2308c825d1e /src/H5FDmpiposix.c | |
| parent | 7c921910d079b49107e50bf7dda97c73cb66b19d (diff) | |
| download | hdf5-8a5e400fda99c06a930e7acdcbe6afad7f1f57dc.zip hdf5-8a5e400fda99c06a930e7acdcbe6afad7f1f57dc.tar.gz hdf5-8a5e400fda99c06a930e7acdcbe6afad7f1f57dc.tar.bz2 | |
[svn-r20588] Description:
Clean up code a bit, move new "terminate" VFD callback to new position
in H5FD_class_t struct.
Tested on:
Mac OS X/32 10.6.7 (amazon) w/debug & production
(h5committest not required on this branch)
Diffstat (limited to 'src/H5FDmpiposix.c')
| -rw-r--r-- | src/H5FDmpiposix.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index 6328ef7..3c40bd0 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -174,6 +174,7 @@ typedef struct H5FD_mpiposix_t { (file_offset_t)((A)+(Z))<(file_offset_t)(A)) /* Callbacks */ +static herr_t H5FD_mpiposix_term(void); static void *H5FD_mpiposix_fapl_get(H5FD_t *_file); static void *H5FD_mpiposix_fapl_copy(const void *_old_fa); static herr_t H5FD_mpiposix_fapl_free(void *_fa); @@ -207,6 +208,7 @@ static const H5FD_class_mpi_t H5FD_mpiposix_g = { "mpiposix", /*name */ MAXADDR, /*maxaddr */ H5F_CLOSE_SEMI, /* fc_degree */ + H5FD_mpiposix_term, /*terminate */ NULL, /*sb_size */ NULL, /*sb_encode */ NULL, /*sb_decode */ @@ -224,7 +226,6 @@ static const H5FD_class_mpi_t H5FD_mpiposix_g = { NULL, /*get_type_map */ NULL, /*alloc */ NULL, /*free */ - H5FD_mpiposix_term, /*terminate */ H5FD_mpiposix_get_eoa, /*get_eoa */ H5FD_mpiposix_set_eoa, /*set_eoa */ H5FD_mpiposix_get_eof, /*get_eof */ @@ -305,16 +306,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_mpiposix_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_term) @@ -322,7 +321,7 @@ H5FD_mpiposix_term(void) /* Reset VFL ID */ H5FD_MPIPOSIX_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_mpiposix_term() */ @@ -869,7 +868,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2) const H5FD_mpiposix_t *f2 = (const H5FD_mpiposix_t*)_f2; int ret_value=0; - FUNC_ENTER_NOAPI(H5FD_mpiposix_cmp, H5FD_VFD_DEFAULT) + FUNC_ENTER_NOAPI_NOFUNC_NOINIT(H5FD_mpiposix_cmp) #ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) |