summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-11 12:36:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-11 12:36:08 (GMT)
commit80b958d8b48b0e0467f2816d783bedf2164612a5 (patch)
tree85fd5d2e366fb8dbf49a948396b60995060b3c0a /src
parentd517c77bc0fe9c9dbfd013d720e1533289decd9f (diff)
downloadhdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.zip
hdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.tar.gz
hdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.tar.bz2
[svn-r15613] Description:
Bring back r15612 from trunk: Minor cleanups of formatting, etc. Tested on: Mac OS X/32 10.5.4. (amazon) Too minor to require h5committest
Diffstat (limited to 'src')
-rw-r--r--src/H5HFcache.c7
-rw-r--r--src/H5HFiblock.c2
-rw-r--r--src/H5Ocopy.c2
-rw-r--r--src/H5Shyper.c12
4 files changed, 11 insertions, 12 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 579af46..23e63ca 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -733,7 +733,6 @@ HDfprintf(stderr, "%s: Load indirect block, addr = %a\n", FUNC, addr);
/* Allocate space for the fractal heap indirect block */
if(NULL == (iblock = H5FL_CALLOC(H5HF_indirect_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
- HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
/* Get the pointer to the shared heap header */
hdr = par_info->hdr;
@@ -1074,7 +1073,7 @@ done:
*/
/* ARGSUSED */
herr_t
-H5HF_cache_iblock_dest(H5F_t UNUSED *f, H5HF_indirect_t *iblock)
+H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -1085,6 +1084,7 @@ H5HF_cache_iblock_dest(H5F_t UNUSED *f, H5HF_indirect_t *iblock)
*/
HDassert(iblock);
HDassert(iblock->rc == 0);
+ HDassert(iblock->hdr);
#ifdef QAK
HDfprintf(stderr, "%s: Destroying indirect block\n", FUNC);
#endif /* QAK */
@@ -1093,7 +1093,6 @@ HDfprintf(stderr, "%s: Destroying indirect block\n", FUNC);
iblock->hdr->f = f;
/* Decrement reference count on shared info */
- HDassert(iblock->hdr);
if(H5HF_hdr_decr(iblock->hdr) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
if(iblock->parent)
@@ -1625,7 +1624,7 @@ done:
*/
/* ARGSUSED */
herr_t
-H5HF_cache_dblock_dest(H5F_t UNUSED *f, H5HF_direct_t *dblock)
+H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 221ba09..26e29e1 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -1157,7 +1157,7 @@ HDfprintf(stderr, "%s: iblock_addr = %a, iblock_nrows = %u\n", FUNC, iblock_addr
HDassert(iblock_nrows > 0);
HDassert(did_protect);
- /* Check if we are allow to use existing pinned iblock pointer */
+ /* Check if we are allowed to use existing pinned iblock pointer */
if(!must_protect) {
/* Check for this block already being pinned */
if(par_iblock) {
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 767a2d2..08d9f4f 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -720,7 +720,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
} /* end if */
/* Insert destination object header in cache */
- if(H5AC_set(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__DIRTIED_FLAG) < 0)
+ if(H5AC_set(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to cache object header")
done:
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 502c095..6e8836c 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -23,12 +23,12 @@
#define H5S_PACKAGE /*suppress error about including H5Spkg */
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h" /* ID Functions */
-#include "H5Spkg.h" /* Dataspace functions */
-#include "H5Vprivate.h" /* Vector functions */
+#include "H5private.h" /* Generic Functions */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5Iprivate.h" /* ID Functions */
+#include "H5Spkg.h" /* Dataspace functions */
+#include "H5Vprivate.h" /* Vector functions */
/* Local datatypes */