diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:12:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:12:33 (GMT) |
| commit | ee27c063666c961d4d27aad0b1c7fff3f9e73426 (patch) | |
| tree | 68cb5a775f86928bdcfb2f4275db440ace1e33ed | |
| parent | 1bc07c6aaeadd03d73216af25db0cb46db2391e0 (diff) | |
| download | hdf5-ee27c063666c961d4d27aad0b1c7fff3f9e73426.zip hdf5-ee27c063666c961d4d27aad0b1c7fff3f9e73426.tar.gz hdf5-ee27c063666c961d4d27aad0b1c7fff3f9e73426.tar.bz2 | |
[svn-r18033] Description:
Correct error in merging Coverity changes in r18011
Tested on:
None - eyeballed only (very simple)
| -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() */ |