summaryrefslogtreecommitdiffstats
path: root/src/H5Oefl.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-01-07 23:22:23 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-01-07 23:22:23 (GMT)
commitf0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67 (patch)
tree75db636de976919b35280e21cc13f5cf9070359e /src/H5Oefl.c
parent419b3d66495271b1eff9037e63b2f4bca235316d (diff)
downloadhdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.zip
hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.gz
hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.bz2
[svn-r18073] Description:
Bring r18072 from trunk to 1.8 branch: Bring r18071 from metadata journaling merge branch: Refactor local heap routines with changes from metadata journaling branch, along with other misc. changes as the changes on the metadata journaling branch are being converged with the current state of the trunk. Tested on: Mac OS X/32 10.6.2 (amazon) debug & prod Linux/64 2.6 (amani) prod FreeBSD/64 (liberty) prod
Diffstat (limited to 'src/H5Oefl.c')
-rw-r--r--src/H5Oefl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 5702b34..b16f415 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -126,11 +126,11 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh,
if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value")
- s = (const char *)H5HL_offset_into(f, heap, 0);
+ s = (const char *)H5HL_offset_into(heap, 0);
HDassert(s && !*s);
- if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr) < 0)
+ if(H5HL_unprotect(f, heap) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
heap = NULL;
#endif
@@ -146,7 +146,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh,
/* Name */
H5F_DECODE_LENGTH (f, p, mesg->slot[u].name_offset);
- s = (const char *)H5HL_offset_into(f, heap, mesg->slot[u].name_offset);
+ s = (const char *)H5HL_offset_into(heap, mesg->slot[u].name_offset);
HDassert(s && *s);
mesg->slot[u].name = H5MM_xstrdup (s);
HDassert(mesg->slot[u].name);
@@ -159,7 +159,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh,
HDassert(mesg->slot[u].size > 0);
} /* end for */
- if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr) < 0)
+ if(H5HL_unprotect(f, heap) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
heap = NULL;
@@ -482,7 +482,7 @@ H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
done:
/* Release resources */
- if(heap && H5HL_unprotect(file_dst, dxpl_id, heap, efl_dst->heap_addr) < 0)
+ if(heap && H5HL_unprotect(file_dst, heap) < 0)
HDONE_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to unprotect EFL file name heap")
if(!ret_value)
if(efl_dst)