From 0126d4369888d47975d7340a1780063566a28dd7 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Sun, 1 Jun 2008 01:54:51 -0500 Subject: [svn-r15114] Bug fix. Rename H5Pset_fapl_journal as H5Pset_journal. Use the public constant of H5AC2__CURR_CACHE_CONFIG_VERSION. Tested: h5committested. (tools/h5recover/testh5reover.sh had failures but that was because ../h5diff/h5diff's failure.) --- src/H5C2journal.c | 8 ++++---- src/H5C2public.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/H5C2journal.c b/src/H5C2journal.c index dbf78ce..3e6655e 100644 --- a/src/H5C2journal.c +++ b/src/H5C2journal.c @@ -3493,7 +3493,7 @@ H5C2_jb__bin2hex(const uint8_t * buf, /*------------------------------------------------------------------------- - * Function: H5Pset_fapl_journal + * Function: H5Pset_journal * * Purpose: Modify the file access property list to enable journaling. * @@ -3507,13 +3507,13 @@ H5C2_jb__bin2hex(const uint8_t * buf, *------------------------------------------------------------------------- */ herr_t -H5Pset_fapl_journal(hid_t fapl_id, const char *journal_file) +H5Pset_journal(hid_t fapl_id, const char *journal_file) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* set to SUCCEED for now. */ H5AC2_cache_config_t mdj_config; - FUNC_ENTER_API(H5Pset_fapl_journal, FAIL) + FUNC_ENTER_API(H5Pset_journal, FAIL) /* Check/fix arguments */ if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) @@ -3524,7 +3524,7 @@ H5Pset_fapl_journal(hid_t fapl_id, const char *journal_file) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file name too long") /* setup cache config struct to enable journaling */ - mdj_config.version = H5C2__CURR_AUTO_SIZE_CTL_VER; + mdj_config.version = H5AC2__CURR_CACHE_CONFIG_VERSION; /* get cache config struct information */ H5Pget_mdc_config(fapl_id, (H5AC_cache_config_t *)&mdj_config); diff --git a/src/H5C2public.h b/src/H5C2public.h index 6416d12..150e05c 100644 --- a/src/H5C2public.h +++ b/src/H5C2public.h @@ -30,7 +30,7 @@ /* Public headers needed by this file */ #include "H5public.h" -#include "H5Fpublic.h" /*for H5Pset_fapl_journal */ +#include "H5Fpublic.h" /*for H5Pset_journal */ #ifdef __cplusplus extern "C" { @@ -57,7 +57,7 @@ enum H5C2_cache_decr_mode H5C2_decr__age_out_with_threshold }; -H5_DLL herr_t H5Pset_fapl_journal(hid_t fapl_id, const char *journal_file); +H5_DLL herr_t H5Pset_journal(hid_t fapl_id, const char *journal_file); #ifdef __cplusplus } -- cgit v0.12