diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:28:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:28:42 (GMT) |
| commit | de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c (patch) | |
| tree | bfc3d70d04325c8574801e433c24182693096d11 /src/H5Bcache.c | |
| parent | 77038a81755bd6c853323ba261c9c671800d7be7 (diff) | |
| download | hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.zip hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.tar.gz hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.tar.bz2 | |
[svn-r18035] Description:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Bcache.c')
| -rw-r--r-- | src/H5Bcache.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/H5Bcache.c b/src/H5Bcache.c index 9f7444b..01dc737 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -224,8 +224,8 @@ H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_type, void *udata) UINT16DECODE(p, bt->nchildren); /* sibling pointers */ - H5F_addr_decode(f, (const uint8_t **) &p, &(bt->left)); - H5F_addr_decode(f, (const uint8_t **) &p, &(bt->right)); + H5F_addr_decode(f, (const uint8_t **)&p, &(bt->left)); + H5F_addr_decode(f, (const uint8_t **)&p, &(bt->right)); /* the child/key pairs */ native = bt->native; @@ -237,7 +237,7 @@ H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_type, void *udata) native += type->sizeof_nkey; /* Decode address value */ - H5F_addr_decode(f, (const uint8_t **) &p, bt->child + u); + H5F_addr_decode(f, (const uint8_t **)&p, bt->child + u); } /* end for */ /* Decode final key */ @@ -274,7 +274,7 @@ done: static herr_t H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, unsigned UNUSED * flags_ptr) { - H5B_shared_t *shared; /* Pointer to shared B-tree info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5B_flush) @@ -408,7 +408,7 @@ H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr) HDassert(f); HDassert(bt); HDassert(bt->rc_shared); - shared=(H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared); + shared = (H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared); HDassert(shared); HDassert(shared->type); HDassert(size_ptr); @@ -418,3 +418,4 @@ H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr) FUNC_LEAVE_NOAPI(SUCCEED) } /* H5B_compute_size() */ + |