diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-10 19:02:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-10 19:02:40 (GMT) |
| commit | f4d4d427b2f8bae72a12d4cdbee6acfc233b4c44 (patch) | |
| tree | 37f5eb0424b03707bf38eb5608bd4bb8926e14e2 /src/H5C.c | |
| parent | eaf4ee3eb992809394f74e607b932482126a5b57 (diff) | |
| download | hdf5-f4d4d427b2f8bae72a12d4cdbee6acfc233b4c44.zip hdf5-f4d4d427b2f8bae72a12d4cdbee6acfc233b4c44.tar.gz hdf5-f4d4d427b2f8bae72a12d4cdbee6acfc233b4c44.tar.bz2 | |
[svn-r17461] Description:
Fix a few more problems when the user block is not aligned properly.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
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.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5C.c')
| -rw-r--r-- | src/H5C.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -6211,7 +6211,7 @@ H5C_protect(H5F_t * f, /* Check for trying to load the wrong type of entry from an address */ if(entry_ptr->type != type) - HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, NULL, "not a dataset creation property list") + HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, NULL, "incorrect cache entry type") hit = TRUE; thing = (void *)entry_ptr; @@ -10716,7 +10716,7 @@ end_of_inner_loop: */ HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ - "Can't unpin all pinned entries 1.") + "Pinned entry count not decreasing.") } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) { @@ -10759,7 +10759,7 @@ end_of_inner_loop: } else if ( cur_pel_len > 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ - "Can't unpin all pinned entries 2.") + "Can't unpin all pinned entries.") } @@ -10994,7 +10994,7 @@ H5C_flush_single_entry(H5F_t * f, if ( NULL == (dxpl = H5I_object(primary_dxpl_id)) ) { HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, \ - "not a dataset creation property list") + "not a dataset transfer property list") } /* Get the transfer mode property */ |