diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 17:03:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 17:03:50 (GMT) |
| commit | 8277f14664ad02bd831a130fbf4fc113e8dd4fe0 (patch) | |
| tree | 3a7fe29ce5b018b8e6ecd648eb76db2641c38ca4 /src/H5Dint.c | |
| parent | 2b82a5fff3afb64811aa38ceb8ee8743cabdddc6 (diff) | |
| download | hdf5-8277f14664ad02bd831a130fbf4fc113e8dd4fe0.zip hdf5-8277f14664ad02bd831a130fbf4fc113e8dd4fe0.tar.gz hdf5-8277f14664ad02bd831a130fbf4fc113e8dd4fe0.tar.bz2 | |
[svn-r18071] Description:
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
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 3b2faf2..c00c374 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -907,7 +907,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset) /* Insert "empty" name first */ if((size_t)(-1) == H5HL_insert(file, dxpl_id, heap, (size_t)1, "")) { - H5HL_unprotect(file, dxpl_id, heap, efl->heap_addr); + H5HL_unprotect(file, heap); HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert file name into heap") } /* end if */ @@ -917,7 +917,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset) /* Insert file name into heap */ if((size_t)(-1) == (offset = H5HL_insert(file, dxpl_id, heap, HDstrlen(efl->slot[u].name) + 1, efl->slot[u].name))) { - H5HL_unprotect(file, dxpl_id, heap, efl->heap_addr); + H5HL_unprotect(file, heap); HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert file name into heap") } /* end if */ @@ -927,7 +927,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset) } /* end for */ /* Release the heap */ - if(H5HL_unprotect(file, dxpl_id, heap, efl->heap_addr) < 0) + if(H5HL_unprotect(file, heap) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect EFL file name heap") heap = NULL; |