diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-29 20:13:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-29 20:13:49 (GMT) |
| commit | b05a1c671317403994e4bff5564563f41d348eea (patch) | |
| tree | 97245dc33498888a05394a888d47a22acb06580c /src/H5HFdblock.c | |
| parent | 789e672956c99300d6e22f602fae5bc2fe286ce6 (diff) | |
| download | hdf5-b05a1c671317403994e4bff5564563f41d348eea.zip hdf5-b05a1c671317403994e4bff5564563f41d348eea.tar.gz hdf5-b05a1c671317403994e4bff5564563f41d348eea.tar.bz2 | |
[svn-r18671] Description:
Mostly minor code cleanups and reformatting to better set up udata
parameters when protecting metadata cache entries. Also, some changes to
better align with state of code on the trunk.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
Diffstat (limited to 'src/H5HFdblock.c')
| -rw-r--r-- | src/H5HFdblock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index a751231..893ced8 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -475,11 +475,13 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, udata.filter_mask = par_iblock->filt_ents[par_entry].filter_mask; } /* end else */ } /* end if */ - else + else { odi_size = dblock_size; + udata.filter_mask = 0; + } /* end else */ /* Protect the direct block */ - if(NULL == (dblock = H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, odi_size, (void *)&udata, rw))) + if(NULL == (dblock = H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, odi_size, &udata, rw))) HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap direct block") /* Set the return value */ |