diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-08-22 20:56:51 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-08-22 20:56:51 (GMT) |
| commit | 794a2df2684c58fa61943963369ffa72626d9111 (patch) | |
| tree | 8f2629916d0f7dab6076d95be081c2513b7f4e1d /src/H5FDdirect.c | |
| parent | 2051b4e03e8af8a08839a8674a5629a74c7954ae (diff) | |
| parent | 80a409e14dc85f8bdb0dff424f528d3a0bcf7891 (diff) | |
| download | hdf5-794a2df2684c58fa61943963369ffa72626d9111.zip hdf5-794a2df2684c58fa61943963369ffa72626d9111.tar.gz hdf5-794a2df2684c58fa61943963369ffa72626d9111.tar.bz2 | |
[svn-r21286] Merging r20545 through r21283 from trunk to avoid_truncate branch.
Tested:
h5committest
Diffstat (limited to 'src/H5FDdirect.c')
| -rw-r--r-- | src/H5FDdirect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 7974f99..a44857c 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -155,6 +155,7 @@ typedef struct H5FD_direct_t { (file_offset_t)((A)+(Z))<(file_offset_t)(A)) /* Prototypes */ +static herr_t H5FD_direct_term(void); static void *H5FD_direct_fapl_get(H5FD_t *file); static void *H5FD_direct_fapl_copy(const void *_old_fa); static H5FD_t *H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, @@ -176,6 +177,7 @@ static const H5FD_class_t H5FD_direct_g = { "direct", /*name */ MAXADDR, /*maxaddr */ H5F_CLOSE_WEAK, /* fc_degree */ + H5FD_direct_term, /*terminate */ NULL, /*sb_size */ NULL, /*sb_encode */ NULL, /*sb_decode */ @@ -273,16 +275,14 @@ done: * * Purpose: Shut down the VFD * - * Return: <none> + * Returns: Non-negative on success or negative on failure * * Programmer: Raymond Lu * Wednesday, 20 September 2006 * - * Modification: - * *--------------------------------------------------------------------------- */ -void +static herr_t H5FD_direct_term(void) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_direct_term) @@ -290,7 +290,7 @@ H5FD_direct_term(void) /* Reset VFL ID */ H5FD_DIRECT_g=0; - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_direct_term() */ @@ -678,7 +678,7 @@ H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2) const H5FD_direct_t *f2 = (const H5FD_direct_t*)_f2; int ret_value=0; - FUNC_ENTER_NOAPI(H5FD_direct_cmp, H5FD_VFD_DEFAULT) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_direct_cmp) #ifdef _WIN32 if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1) |