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/H5FDwindows.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/H5FDwindows.c')
| -rw-r--r-- | src/H5FDwindows.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c index 864a958..de3fe33 100644 --- a/src/H5FDwindows.c +++ b/src/H5FDwindows.c @@ -127,6 +127,7 @@ typedef struct H5FD_windows_t { (fseek_offset_t)((A)+(Z))<(fseek_offset_t)(A)) /* Prototypes */ +static herr_t H5FD_windows_term(void); static H5FD_t *H5FD_windows_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_windows_close(H5FD_t *_file); @@ -149,6 +150,7 @@ static const H5FD_class_t H5FD_windows_g = { "windows", /*name */ MAXADDR, /*maxaddr */ H5F_CLOSE_WEAK, /* fc_degree */ + H5FD_windows_term, /*terminate */ NULL, /*sb_size */ NULL, /*sb_encode */ NULL, /*sb_decode */ @@ -166,7 +168,6 @@ static const H5FD_class_t H5FD_windows_g = { NULL, /*get_type_map */ NULL, /*alloc */ NULL, /*free */ - H5FD_windows_term, /*terminate */ H5FD_windows_get_eoa, /*get_eoa */ H5FD_windows_set_eoa, /*set_eoa */ H5FD_windows_get_eof, /*get_eof */ @@ -241,17 +242,14 @@ done: * * Purpose: Shut down the VFD * - * Return: <none> + * Returns: Non-negative on success or negative on failure * * Programmer: Scott Wegner - * Based on code by Quincey Koziol * Thursday, May 24 2007 * - * Modification: - * *--------------------------------------------------------------------------- */ -void +static herr_t H5FD_windows_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_windows_term) @@ -259,7 +257,7 @@ H5FD_windows_term(void) /* Reset VFL ID */ H5FD_WINDOWS_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_windows_term() */ /*------------------------------------------------------------------------- @@ -513,10 +511,10 @@ H5FD_windows_cmp(const H5FD_t *_f1, const H5FD_t *_f2) const H5FD_windows_t *f2 = (const H5FD_windows_t*)_f2; int ret_value=0; - FUNC_ENTER_NOAPI(H5FD_windows_cmp, H5FD_VFD_DEFAULT) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_windows_cmp) - if (f1->volumeserialnumber < f2->volumeserialnumber) HGOTO_DONE(-1) - if (f1->volumeserialnumber > f2->volumeserialnumber) HGOTO_DONE(1) + if (f1->volumeserialnumber < f2->volumeserialnumber) HGOTO_DONE(-1) + if (f1->volumeserialnumber > f2->volumeserialnumber) HGOTO_DONE(1) if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) if (f1->fileindexhi > f2->fileindexhi) HGOTO_DONE(1) |