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/H5HFcache.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/H5HFcache.c')
| -rw-r--r-- | src/H5HFcache.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c index 990c44c..8fc5d14 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -978,12 +978,12 @@ H5HF_cache_dblock_deserialize(haddr_t addr, size_t len, const void *image, void *_udata, hbool_t *dirty) { H5HF_dblock_cache_ud_t *udata = (H5HF_dblock_cache_ud_t *)_udata; /* pointer to user data */ - H5HF_hdr_t *hdr; /* Shared fractal heap information */ - H5HF_parent_t *par_info; /* Pointer to parent information */ - H5HF_direct_t *dblock = NULL; /* Direct block info */ - const uint8_t *p; /* Pointer into raw data buffer */ - haddr_t heap_addr; /* Address of heap header in the file */ - H5HF_direct_t *ret_value; /* Return value */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ + H5HF_parent_t *par_info; /* Pointer to parent information */ + H5HF_direct_t *dblock = NULL; /* Direct block info */ + const uint8_t *p; /* Pointer into raw data buffer */ + haddr_t heap_addr; /* Address of heap header in the file */ + H5HF_direct_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_deserialize) @@ -1000,10 +1000,8 @@ H5HF_cache_dblock_deserialize(haddr_t addr, size_t len, const void *image, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t)); - - par_info = (H5HF_parent_t *)(&(udata->par_info)); - /* Get the pointer to the shared heap header */ + par_info = (H5HF_parent_t *)(&(udata->par_info)); hdr = par_info->hdr; /* Set the shared heap header's file context for this operation */ |