summaryrefslogtreecommitdiffstats
path: root/src/H5C.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-09-10 19:33:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-09-10 19:33:12 (GMT)
commit0b3fbf90899f97a7817779c106e171b89f19a042 (patch)
tree5bd630b6ead0b1fefe5b82a7db968c704b4614cc /src/H5C.c
parentd5c362618144381b3d2cb8030b6cd75d75bbe1bf (diff)
downloadhdf5-0b3fbf90899f97a7817779c106e171b89f19a042.zip
hdf5-0b3fbf90899f97a7817779c106e171b89f19a042.tar.gz
hdf5-0b3fbf90899f97a7817779c106e171b89f19a042.tar.bz2
[svn-r17462] Description:
Bring r17461 from trunk to 1.8 branch: Fix a few more problems when the user block is not aligned properly. Tested on: FreeBSD/32 6.3 (duty) in debug mode (h5committested on trunk)
Diffstat (limited to 'src/H5C.c')
-rw-r--r--src/H5C.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5C.c b/src/H5C.c
index df13fb6..5a5d89d 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -6143,7 +6143,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;
@@ -10252,7 +10252,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
*/
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 ) ) {
@@ -10295,7 +10295,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
} 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.")
}
@@ -10530,7 +10530,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 */