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/H5FDcore.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/H5FDcore.c')
-rw-r--r-- | src/H5FDcore.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 68a1e93..9147f84 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -111,6 +111,7 @@ typedef struct H5FD_core_fapl_t { (size_t)((A)+(Z))<(size_t)(A)) /* Prototypes */ +static herr_t H5FD_core_term(void); static void *H5FD_core_fapl_get(H5FD_t *_file); static H5FD_t *H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); @@ -132,6 +133,7 @@ static const H5FD_class_t H5FD_core_g = { "core", /*name */ MAXADDR, /*maxaddr */ H5F_CLOSE_WEAK, /*fc_degree */ + H5FD_core_term, /*terminate */ NULL, /*sb_size */ NULL, /*sb_encode */ NULL, /*sb_decode */ @@ -149,7 +151,6 @@ static const H5FD_class_t H5FD_core_g = { NULL, /*get_type_map */ NULL, /*alloc */ NULL, /*free */ - H5FD_core_term, /*terminate */ H5FD_core_get_eoa, /*get_eoa */ H5FD_core_set_eoa, /*set_eoa */ H5FD_core_get_eof, /*get_eof */ @@ -226,16 +227,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_core_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_term) @@ -243,7 +242,7 @@ H5FD_core_term(void) /* Reset VFL ID */ H5FD_CORE_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_core_term() */ |