mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-25 17:00:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14359] Description:

Browse Source 
Corrected a compiler warning in the local heap code.

	Fixed the shared message flag symbols from the recent switchover.

Tested on:
	FreeBSD 6.2/32 (duty)
This commit is contained in:
Quincey Koziol 2007-12-23 22:38:00 -05:00
parent 02a90afcdc
commit 8a2c76ed69
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/h5_shared_mesg.c
View File

@ -112,7 +112,7 @@ int main(void)
* it holds. For the simple case, we'll put every message that could be
* shared in this single index.
*/
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40);
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
if(ret < 0) goto error;
/* The other property that can be set for shared messages is the
@ -148,7 +148,7 @@ int main(void)
* will be about the same size as a normal file (with just a little extra
* overhead).
*/
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 1000);
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 1000);
if(ret < 0) goto error;
ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id);
@ -159,7 +159,7 @@ int main(void)
* attributes (which might make sense if we were going to use committed
* datatypes). We could change the flags on the index:
*/
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 40);
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 40);
if(ret < 0) goto error;
ret = create_standard_file("only_dspaces_and_attrs_file.h5", fcpl_id);
@ -172,9 +172,9 @@ int main(void)
*/
ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2);
if(ret < 0) goto error;
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 40);
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 40);
if(ret < 0) goto error;
ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ATTR_FLAG, 40);
ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40);
if(ret < 0) goto error;
ret = create_standard_file("separate_indexes_file.h5", fcpl_id);
@ -187,7 +187,7 @@ int main(void)
*/
ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1);
if(ret < 0) goto error;
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40);
ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40);
if(ret < 0) goto error;
ret = H5Pset_shared_mesg_phase_change(fcpl_id, 5, 0);

2
src/H5HL.c
View File

@ -1159,7 +1159,7 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
* if an error occurs -QAK)
*/
if(H5AC_mark_pinned_or_protected_entry_dirty(f, heap) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, (size_t)(-1), "unable to mark heap as dirty")
HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap as dirty")
/*
* Check if this chunk can be prepended or appended to an already