summaryrefslogtreecommitdiffstats
path: root/src/H5AC.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-13 04:55:44 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-13 04:55:44 (GMT)
commit970fcd54e0693dafa78f567639a99cf059fa1425 (patch)
treee9edcd76f9840357d95663630431727f4e8873b3 /src/H5AC.c
parentc7ad57374b5a3633e32a6675a8ca8345d626aaba (diff)
downloadhdf5-970fcd54e0693dafa78f567639a99cf059fa1425.zip
hdf5-970fcd54e0693dafa78f567639a99cf059fa1425.tar.gz
hdf5-970fcd54e0693dafa78f567639a99cf059fa1425.tar.bz2
[svn-r15212] Description:
Bring back revision 15211 from trunk: Update the gcc flags for version 4.3 Clean up warnings Tested on: Mac OS X/32 10.5.3 (amazon)
Diffstat (limited to 'src/H5AC.c')
-rw-r--r--src/H5AC.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index cd79e6a..e4639f3 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -43,8 +43,8 @@
*-------------------------------------------------------------------------
*/
-#define H5C_PACKAGE /*suppress error about including H5Cpkg */
#define H5AC_PACKAGE /*suppress error about including H5ACpkg */
+#define H5C_PACKAGE /*suppress error about including H5Cpkg */
#define H5F_PACKAGE /*suppress error about including H5Fpkg */
/* Interface initialization */
@@ -2319,7 +2319,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
}
#endif /* H5AC__TRACE_FILE_ENABLED */
- dirtied = ( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) ||
+ dirtied = (hbool_t)( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) ||
( ((H5AC_info_t *)thing)->dirtied ) );
if ( dirtied ) {
@@ -3064,7 +3064,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
{
herr_t result;
herr_t ret_value = SUCCEED; /* Return value */
- int name_len;
+ size_t name_len;
H5C_auto_size_ctl_t internal_config;
FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL)
@@ -3109,7 +3109,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
*/
name_len = HDstrlen(config_ptr->trace_file_name);
- if ( name_len <= 0 ) {
+ if ( name_len == 0 ) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
"config_ptr->trace_file_name is empty.")