diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:40:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:40:15 (GMT) |
| commit | ac446b613161a8bdcb80648a4b32f67ca2c4b04a (patch) | |
| tree | 75cc244d1b111896328438c627ac241eb4d6cf94 /src/H5Bcache.c | |
| parent | ee27c063666c961d4d27aad0b1c7fff3f9e73426 (diff) | |
| parent | de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c (diff) | |
| download | hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.zip hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.tar.gz hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.tar.bz2 | |
[svn-r18037] Description:
Bring r18035 from merge_metadata_journaling branch to trunk:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Bcache.c')
| -rw-r--r-- | src/H5Bcache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Bcache.c b/src/H5Bcache.c index dc60f9d..cc5bbbf 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -225,8 +225,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; @@ -238,7 +238,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 */ @@ -275,7 +275,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) |