From 22378dbd24c08d7153f4f295b5bca057191edc38 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 21 Oct 2008 11:33:13 -0500 Subject: [svn-r15921] Description: Review and get code to conform to standard library coding style, also add 'const' keyword to "set" routines. 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 --- src/H5AC2.c | 50 +++++++++--------------------- src/H5AC2private.h | 4 +-- src/H5F.c | 67 +++++++++------------------------------- src/H5Fpublic.h | 2 +- src/H5Pfapl.c | 91 +++++++++++++++++------------------------------------- src/H5Ppublic.h | 2 +- 6 files changed, 61 insertions(+), 155 deletions(-) diff --git a/src/H5AC2.c b/src/H5AC2.c index 7dcb57a..95d78e2 100644 --- a/src/H5AC2.c +++ b/src/H5AC2.c @@ -3665,22 +3665,21 @@ done: * *------------------------------------------------------------------------- */ - herr_t H5AC2_set_jnl_config(H5F_t * f, hid_t dxpl_id, - H5AC2_jnl_config_t *config_ptr, + const H5AC2_jnl_config_t *config_ptr, hbool_t initializing) { /* const char * fcn_name = "H5AC2_set_jnl_config"; */ H5AC2_t * cache_ptr; herr_t result; - herr_t ret_value = SUCCEED; /* Return value */ H5C2_mdj_config_t internal_config; #if H5AC2__TRACE_FILE_ENABLED H5AC2_jnl_config_t trace_config = H5AC2__DEFAULT_JNL_CONFIG; FILE * trace_file_ptr = NULL; #endif /* H5AC2__TRACE_FILE_ENABLED */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5AC2_set_jnl_config, FAIL) @@ -4014,15 +4013,13 @@ done: * *------------------------------------------------------------------------- */ - herr_t H5AC2_validate_config(H5AC2_cache_config_t * config_ptr) - { herr_t result; - herr_t ret_value = SUCCEED; /* Return value */ int name_len; H5C2_auto_size_ctl_t internal_config; + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5AC2_validate_config, FAIL) @@ -4146,23 +4143,17 @@ done: * *------------------------------------------------------------------------- */ - herr_t -H5AC2_validate_jnl_config(H5AC2_jnl_config_t * config_ptr) - +H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - int name_len; FUNC_ENTER_NOAPI(H5AC2_validate_jnl_config, FAIL) - if ( config_ptr == NULL ) { - + if(config_ptr == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.") - } if ( config_ptr->version != H5AC2__CURR_JNL_CONFIG_VER ) { - #if 0 /* JRM */ HDfprintf(stdout, "version = %d(%d).\n", config_ptr->version, H5AC2__CURR_JNL_CONFIG_VER); @@ -4203,6 +4194,11 @@ H5AC2_validate_jnl_config(H5AC2_jnl_config_t * config_ptr) /* don't test journal_file_path unless enable_journaling is TRUE */ if ( config_ptr->enable_journaling ) { + size_t name_len; + + /* Check for NULL journal file path string */ + if(NULL == config_ptr->journal_file_path) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->journal_file_path is NULL.") /* Can't really test the journal_file_path field without trying to * open the file, so we will content ourselves with a couple of @@ -4210,7 +4206,7 @@ H5AC2_validate_jnl_config(H5AC2_jnl_config_t * config_ptr) */ name_len = HDstrlen(config_ptr->journal_file_path); - if ( name_len <= 0 ) { + if ( name_len == 0 ) { HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ "config_ptr->journal_file_path is empty.") @@ -4251,9 +4247,7 @@ H5AC2_validate_jnl_config(H5AC2_jnl_config_t * config_ptr) } done: - FUNC_LEAVE_NOAPI(ret_value) - } /* H5AC2_validate_jnl_config() */ @@ -4274,19 +4268,12 @@ done: * *------------------------------------------------------------------------- */ - hbool_t H5AC2_validate_jnl_config_ver(int version_num) { - hbool_t valid = FALSE; - - if ( version_num == H5AC2__CURR_JNL_CONFIG_VER ) - { - valid = TRUE; - } - - return(valid); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_validate_jnl_config_ver) + FUNC_LEAVE_NOAPI(version_num == H5AC2__CURR_JNL_CONFIG_VER) } /* H5AC2_validate_jnl_config_ver() */ @@ -4307,19 +4294,12 @@ H5AC2_validate_jnl_config_ver(int version_num) * *------------------------------------------------------------------------- */ - hbool_t H5AC2_validate_cache_config_ver(int version_num) { - hbool_t valid = FALSE; - - if ( version_num == H5AC2__CURR_CACHE_CONFIG_VERSION ) - { - valid = TRUE; - } - - return(valid); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_validate_cache_config_ver) + FUNC_LEAVE_NOAPI(version_num == H5AC2__CURR_CACHE_CONFIG_VERSION) } /* H5AC2_validate_cache_config_ver() */ diff --git a/src/H5AC2private.h b/src/H5AC2private.h index 97b20e2..97283ab 100644 --- a/src/H5AC2private.h +++ b/src/H5AC2private.h @@ -373,12 +373,12 @@ H5_DLL herr_t H5AC2_set_cache_auto_resize_config(H5F_t * f, H5_DLL herr_t H5AC2_set_jnl_config(H5F_t * f, hid_t dxpl_id, - H5AC2_jnl_config_t *config_ptr, + const H5AC2_jnl_config_t *config_ptr, hbool_t initializing); H5_DLL herr_t H5AC2_validate_config(H5AC2_cache_config_t * config_ptr); -H5_DLL herr_t H5AC2_validate_jnl_config(H5AC2_jnl_config_t * config_ptr); +H5_DLL herr_t H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr); H5_DLL hbool_t H5AC2_validate_jnl_config_ver(int version_num); diff --git a/src/H5F.c b/src/H5F.c index caf0892..f301009 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -3369,49 +3369,29 @@ done: * Programmer: John Mainzer * 8/1/08 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ - herr_t -H5Fget_jnl_config(hid_t file_id, - H5AC2_jnl_config_t *config_ptr) +H5Fget_jnl_config(hid_t file_id, H5AC2_jnl_config_t *config_ptr) { - H5F_t *file=NULL; /* File object for file ID */ - herr_t ret_value = SUCCEED; /* Return value */ - herr_t result; + H5F_t *file; /* File object for file ID */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Fget_jnl_config, FAIL) H5TRACE2("e", "i*x", file_id, config_ptr); /* Check args */ - if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { - + if(NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") - } - - if ( ( NULL == config_ptr ) || - ( ! H5AC2_validate_jnl_config_ver(config_ptr->version) ) ) { - + if((NULL == config_ptr) || (!H5AC2_validate_jnl_config_ver(config_ptr->version))) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr") - } /* Go get the journaling configuration */ - result = H5AC2_get_jnl_config(file->shared->cache2, config_ptr); - - if ( result != SUCCEED ) { - - HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "H5AC_get_jnl_config() failed."); - } + if(H5AC2_get_jnl_config(file->shared->cache2, config_ptr) < 0) + HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_jnl_config() failed.") done: - FUNC_LEAVE_API(ret_value) - } /* H5Fget_jnl_config() */ @@ -3428,46 +3408,27 @@ done: * Programmer: John Mainzer * 8/1/08 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ - herr_t -H5Fset_jnl_config(hid_t file_id, - H5AC2_jnl_config_t *config_ptr) +H5Fset_jnl_config(hid_t file_id, const H5AC2_jnl_config_t *config_ptr) { - H5F_t *file=NULL; /* File object for file ID */ - herr_t ret_value = SUCCEED; /* Return value */ - herr_t result; + H5F_t *file; /* File object for file ID */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Fset_jnl_config, FAIL) H5TRACE2("e", "i*x", file_id, config_ptr); /* Check args */ - if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { - + if(NULL == (file = H5I_object_verify(file_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") - } - /* set the resize configuration */ - result = H5AC2_set_jnl_config(file, - H5P_DATASET_XFER_DEFAULT, - config_ptr, - FALSE); - - if ( result != SUCCEED ) { - - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ - "H5AC2_set_jnl_config() failed."); - } + /* Set the resize configuration */ + if(H5AC2_set_jnl_config(file, H5P_DATASET_XFER_DEFAULT, config_ptr, FALSE) < 0) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC2_set_jnl_config() failed.") done: - FUNC_LEAVE_API(ret_value) - } /* H5Fset_jnl_config() */ diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 185775d..ad99539 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -140,7 +140,7 @@ H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size); H5_DLL herr_t H5Fget_jnl_config(hid_t file_id, H5AC2_jnl_config_t *config_ptr); H5_DLL herr_t H5Fset_jnl_config(hid_t file_id, - H5AC2_jnl_config_t *config_ptr); + const H5AC2_jnl_config_t *config_ptr); H5_DLL herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t * config_ptr); H5_DLL herr_t H5Fset_mdc_config(hid_t file_id, diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 7f7e58d..ced4df8 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1455,56 +1455,39 @@ done: * Programmer: J. Mainzer * Thursday, July 31, 2008 * - * Modifications: - * - * Done. - * *------------------------------------------------------------------------- */ herr_t -H5Pset_jnl_config(hid_t plist_id, - H5AC2_jnl_config_t * config_ptr) +H5Pset_jnl_config(hid_t plist_id, const H5AC2_jnl_config_t *config_ptr) { - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* return value */ + H5P_genplist_t *plist; /* Property list pointer */ + herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pset_jnl_config, FAIL); + FUNC_ENTER_API(H5Pset_jnl_config, FAIL) H5TRACE2("e", "i*x", plist_id, config_ptr); /* Get the plist structure */ - if( NULL == ( plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS) ) ) { - - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - } - - /* validate the new configuration */ - if ( H5AC2_validate_jnl_config(config_ptr) < 0 ) { - - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ - "invalid journaling configuration"); - } + if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") - /* set the modified config */ + /* Validate the new configuration */ + if(H5AC2_validate_jnl_config(config_ptr) < 0) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid journaling configuration") - /* If we ever support multiple versions of H5AC_jnl_config_t, we - * will have to test the version and do translation here. + /* Set the modified config */ + /* (If we ever support multiple versions of H5AC_jnl_config_t, we + * will have to test the version and do translation here.) */ - - if(H5P_set(plist, H5F_ACS_JNL_INIT_CONFIG_NAME, config_ptr)<0) { - - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, \ - "can't set initial journaling config"); - } + if(H5P_set(plist, H5F_ACS_JNL_INIT_CONFIG_NAME, config_ptr) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set initial journaling config") done: - - FUNC_LEAVE_API(ret_value); - + FUNC_LEAVE_API(ret_value) } /* H5Pset_jnl_config() */ /*------------------------------------------------------------------------- - * Function: H5Pget_mdc_config + * Function: H5Pget_jnl_config * * Purpose: Retrieve the journaling initial configuration * from the target FAPL. @@ -1518,39 +1501,26 @@ done: * Programmer: J. Mainzer * Thursday, July 31, 2008 * - * Modifications: - * - * None. - * *------------------------------------------------------------------------- */ - herr_t -H5Pget_jnl_config(hid_t plist_id, - H5AC2_jnl_config_t * config_ptr) +H5Pget_jnl_config(hid_t plist_id, H5AC2_jnl_config_t *config_ptr) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pget_jnl_config, FAIL); + FUNC_ENTER_API(H5Pget_jnl_config, FAIL) H5TRACE2("e", "i*x", plist_id, config_ptr); - /* Get the plist structure */ - if ( NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)) ) { - - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - } - - /* validate the config_ptr */ - if ( config_ptr == NULL ) { - + /* Validate the config_ptr */ + if(NULL == config_ptr) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.") - } - - if ( ! H5AC2_validate_jnl_config_ver(config_ptr->version) ) { - + if(!H5AC2_validate_jnl_config_ver(config_ptr->version)) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.") - } + + /* Get the plist structure */ + if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* If we ever support multiple versions of H5AC_jnl_config_t, we * will have to get the cannonical version here, and then translate @@ -1558,16 +1528,11 @@ H5Pget_jnl_config(hid_t plist_id, */ /* Get the current initial metadata cache resize configuration */ - if ( H5P_get(plist, H5F_ACS_JNL_INIT_CONFIG_NAME, config_ptr) < 0 ) { - - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, \ - "can't get initial journaling config"); - } + if(H5P_get(plist, H5F_ACS_JNL_INIT_CONFIG_NAME, config_ptr) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get initial journaling config") done: - - FUNC_LEAVE_API(ret_value); - + FUNC_LEAVE_API(ret_value) } /* H5Pget_jnl_config() */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index a721e22..52cc945 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -257,7 +257,7 @@ H5_DLL herr_t H5Pset_mdc_config(hid_t plist_id, H5_DLL herr_t H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t * config_ptr); /* out */ H5_DLL herr_t H5Pset_jnl_config(hid_t plist_id, - H5AC2_jnl_config_t * config_ptr); + const H5AC2_jnl_config_t * config_ptr); H5_DLL herr_t H5Pget_jnl_config(hid_t plist_id, H5AC2_jnl_config_t * config_ptr); /* out */ H5_DLL herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); -- cgit v0.12