diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-21 15:31:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-21 15:31:38 (GMT) |
| commit | 022fd44954a62efc2fe8dbc3aac0f8852579fcb2 (patch) | |
| tree | 1160cc2511da13bd5702bcec1556adb2f99ddb2e /src/H5Dint.c | |
| parent | 5c220d722e6127947d547eaffe804c4532c23b35 (diff) | |
| download | hdf5-022fd44954a62efc2fe8dbc3aac0f8852579fcb2.zip hdf5-022fd44954a62efc2fe8dbc3aac0f8852579fcb2.tar.gz hdf5-022fd44954a62efc2fe8dbc3aac0f8852579fcb2.tar.bz2 | |
[svn-r15914] Description:
Add return value to metadata journaling status change callback routines,
so we can detect errors in them.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index d4a0ab0..31c2cb2 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -514,11 +514,11 @@ done: * *------------------------------------------------------------------------- */ -static void +static herr_t H5D_journal_status_cb(const H5C2_mdj_config_t *mdj_config, hid_t dxpl_id, void *udata) { - H5D_t *dset = (H5D_t *)udata; /* User callback data */ + H5D_t *dset = (H5D_t *)udata; /* User callback data */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5D_journal_status_cb) @@ -538,7 +538,7 @@ H5D_journal_status_cb(const H5C2_mdj_config_t *mdj_config, hid_t dxpl_id, dset->shared->journaling_enabled = mdj_config->enable_journaling; done: - FUNC_LEAVE_NOAPI_VOID + FUNC_LEAVE_NOAPI(ret_value) } /* end H5D_journal_status_cb() */ @@ -1620,7 +1620,7 @@ H5D_close(H5D_t *dataset) H5D_chunk_stats(dataset, FALSE); #endif /* H5D_CHUNK_DEBUG */ - /* Deregister callback for this dataset with cache, when journaling status changes */ + /* Deregister journaling status change cache callback for this dataset */ if(dataset->mdjsc_idx >= 0) if(H5AC2_deregister_mdjsc_callback(dataset->oloc.file, dataset->mdjsc_idx) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't deregister journal status callback") |