diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-11-20 20:24:23 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-11-20 20:24:23 (GMT) |
commit | 8830acb2cbc9384978c22a3e01f4dd15276290e5 (patch) | |
tree | 3ff95fe7a8885ade286b1caeb350e57ef25b63e2 /src/H5SMcache.c | |
parent | 5c6f1819d5033b2443a165b12b81b0343bec6456 (diff) | |
download | hdf5-8830acb2cbc9384978c22a3e01f4dd15276290e5.zip hdf5-8830acb2cbc9384978c22a3e01f4dd15276290e5.tar.gz hdf5-8830acb2cbc9384978c22a3e01f4dd15276290e5.tar.bz2 |
[svn-r28422] Description:
Revert most of r27549, since revise_chunks code requires debugging contexts
for v2 B-trees. Also, misc. warning cleanups and alignments w/changes on
revise_chunks branch.
Tested on:
MacOSX/64 10.11.1 (amazon) w/serial & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5SMcache.c')
-rw-r--r-- | src/H5SMcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 1bdd95a..c66fd0a 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -540,7 +540,7 @@ H5SM__cache_list_deserialize(const void *_image, size_t len, void *_udata, /* Read messages into the list array */ ctx.sizeof_addr = H5F_SIZEOF_ADDR(udata->f); for(u = 0; u < udata->header->num_messages; u++) { - if(H5SM_message_decode(image, &(list->messages[u]), &ctx) < 0) + if(H5SM__message_decode(image, &(list->messages[u]), &ctx) < 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "can't decode shared message") image += H5SM_SOHM_ENTRY_SIZE(udata->f); @@ -661,7 +661,7 @@ H5SM__cache_list_serialize(const H5F_t *f, void *_image, size_t len, ctx.sizeof_addr = H5F_SIZEOF_ADDR(f); for(u = 0; ((u < list->header->list_max) && (mesgs_serialized < list->header->num_messages)); u++) { if(list->messages[u].location != H5SM_NO_LOC) { - if(H5SM_message_encode(image, &(list->messages[u]), &ctx) < 0) + if(H5SM__message_encode(image, &(list->messages[u]), &ctx) < 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTFLUSH, FAIL, "unable to serialize shared message") image += H5SM_SOHM_ENTRY_SIZE(f); |