summaryrefslogtreecommitdiffstats
path: root/src/H5B.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-07-28 19:37:35 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-07-28 19:37:35 (GMT)
commit2681ce4a86ca3c6400ba242bc336d23c77753ff5 (patch)
treef4cb88dcd07675a7a4c76141a080148cee1eabc7 /src/H5B.c
parente4834c43ce6528308ebd5375bd4c7a0df88af427 (diff)
downloadhdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.zip
hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.gz
hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.bz2
[svn-r1549] Changes since 19990728
---------------------- ./src/H5B.c [1.3] ./src/H5D.c [1.3] ./src/H5F.c [1.3] ./src/H5Farray.c [1.3] ./src/H5Fcore.c [1.3] ./src/H5Ffamily.c [1.3] ./src/H5Fistore.c [1.3] ./src/H5Flow.c [1.3] ./src/H5Fmpio.c [1.3] ./src/H5Fprivate.h [1.3] ./src/H5Fsplit.c [1.3] ./src/H5Fstdio.c [1.3] ./src/H5G.c [1.3] ./src/H5HG.c [1.3] ./src/H5HL.c [1.3] ./src/H5MF.c [1.3] ./src/H5O.c [1.3] ./src/H5Odtype.c [1.3] ./src/H5Oefl.c [1.3] ./src/H5P.c [1.3] ./src/H5Smpio.c [1.3] ./src/H5T.c [1.3] ./src/H5detect.c [1.3] ./tools/h5debug.c [1.3] Some of the H5F_addr_* functions were optimized away. ./src/H5D.c [1.3] Fixed the return values from NULL to FAIL on one MPI-IO function.
Diffstat (limited to 'src/H5B.c')
-rw-r--r--src/H5B.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5B.c b/src/H5B.c
index 5bb6a35..0f401dc 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -188,7 +188,7 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata,
sizeof_rkey = (type->get_sizeof_rkey) (f, udata);
size = H5B_nodesize(f, type, &total_native_keysize, sizeof_rkey);
if (H5MF_alloc(f, H5MF_META, (hsize_t)size, addr_p/*out*/) < 0) {
- H5F_addr_undef(addr_p);
+ *addr_p = H5F_ADDR_UNDEF;
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"file allocation failed for B-tree root node");
}
@@ -202,8 +202,8 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata,
bt->ndirty = 0;
bt->type = type;
bt->level = 0;
- H5F_addr_undef(&(bt->left));
- H5F_addr_undef(&(bt->right));
+ bt->left = H5F_ADDR_UNDEF;
+ bt->right = H5F_ADDR_UNDEF;
bt->nchildren = 0;
if (NULL==(bt->page=H5MM_calloc(size)) ||
NULL==(bt->native=H5MM_malloc(total_native_keysize)) ||
@@ -225,7 +225,7 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata,
bt->key[i].dirty = FALSE;
bt->key[i].rkey = bt->page + offset;
bt->key[i].nkey = NULL;
- H5F_addr_undef(bt->child + i);
+ bt->child[i] = H5F_ADDR_UNDEF;
}
/*
@@ -353,7 +353,7 @@ H5B_load(H5F_t *f, haddr_t addr, const void *_type, void *udata)
if (i < bt->nchildren) {
H5F_addr_decode(f, (const uint8_t **) &p, bt->child + i);
} else {
- H5F_addr_undef(bt->child + i);
+ bt->child[i] = H5F_ADDR_UNDEF;
p += H5F_SIZEOF_ADDR(f);
}
}
@@ -960,8 +960,8 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr,
}
bt->dirty = TRUE;
bt->ndirty = 0;
- H5F_addr_undef(&(bt->left));
- H5F_addr_undef(&(bt->right));
+ bt->left = H5F_ADDR_UNDEF;
+ bt->right = H5F_ADDR_UNDEF;
bt->nchildren = 0;
/* the new root */
@@ -1774,8 +1774,8 @@ H5B_remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type,
sibling->left = bt->left;
sibling->dirty = TRUE;
}
- H5F_addr_undef(&(bt->left));
- H5F_addr_undef(&(bt->right));
+ bt->left = H5F_ADDR_UNDEF;
+ bt->right = H5F_ADDR_UNDEF;
sizeof_rkey = (type->get_sizeof_rkey)(f, udata);
sizeof_node = H5B_nodesize(f, type, NULL, sizeof_rkey);
if (H5AC_unprotect(f, H5AC_BT, addr, bt)<0 ||