diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
| commit | c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b (patch) | |
| tree | a1e316063fb77793ab94ad890f33eb99d0740fc9 /src/H5AC.c | |
| parent | 9e9f96879d760850794a191988a205fbf1a3957d (diff) | |
| download | hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.zip hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.gz hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.bz2 | |
[svn-r15300] Description:
Bring revisions 15210:15289 from the trunk into the metadata journaling branch.
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
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5AC.c')
| -rw-r--r-- | src/H5AC.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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.") |