diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:15:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:15:36 (GMT) |
| commit | 856b2e2c259e94516c9b04e57368018fd44f58cf (patch) | |
| tree | ac80e1d6feed1c06391c8b9f7353ea1ad7ea8e7d /src/H5FDlog.c | |
| parent | 80385ab8dd171a8410bd8e7dfce0e6b679c3fc97 (diff) | |
| download | hdf5-856b2e2c259e94516c9b04e57368018fd44f58cf.zip hdf5-856b2e2c259e94516c9b04e57368018fd44f58cf.tar.gz hdf5-856b2e2c259e94516c9b04e57368018fd44f58cf.tar.bz2 | |
[svn-r18034] Description:
Bring r18033 from trunk to 1.8 branch:
Correct error in merging Coverity changes in r18011
Tested on:
None - eyeballed only (very simple)
Diffstat (limited to 'src/H5FDlog.c')
| -rw-r--r-- | src/H5FDlog.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index bde63cc..0da5765 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -425,7 +425,7 @@ H5FD_log_fapl_copy(const void *_old_fa) FUNC_ENTER_NOAPI(H5FD_log_fapl_copy, NULL) - HDassert(new_fa); + HDassert(old_fa); /* Allocate the new FAPL info */ if(NULL == (new_fa = (H5FD_log_fapl_t *)H5MM_calloc(sizeof(H5FD_log_fapl_t)))) @@ -471,17 +471,15 @@ static herr_t H5FD_log_fapl_free(void *_fa) { H5FD_log_fapl_t *fa = (H5FD_log_fapl_t*)_fa; - herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_log_fapl_free, FAIL) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_fapl_free) /* Free the fapl information */ if(fa->logfile) H5MM_xfree(fa->logfile); H5MM_xfree(fa); -done: - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FD_log_fapl_free() */ |