diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-01-22 19:57:48 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-01-22 19:57:48 (GMT) |
commit | dec0c95436846315e677c69fdb8c44c0dd0a8c8b (patch) | |
tree | 1f63e3d112762453aac71cf36e4564f50d40efa3 /src/H5B.c | |
parent | a0ee2c57e934c5ff2269e345238a6ee019f6c294 (diff) | |
download | hdf5-dec0c95436846315e677c69fdb8c44c0dd0a8c8b.zip hdf5-dec0c95436846315e677c69fdb8c44c0dd0a8c8b.tar.gz hdf5-dec0c95436846315e677c69fdb8c44c0dd0a8c8b.tar.bz2 |
[svn-r165] Changes since 19980122
----------------------
./src/H5.c
./src/H5B.c
./src/H5Bprivate.h
Changed `new' to something else in 6 places for Fabio.
./src/H5T.c
./src/H5Tconv.c
Beginning to work on compound data type conversion. Don't look
yet :-)
Diffstat (limited to 'src/H5B.c')
-rw-r--r-- | src/H5B.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1033,7 +1033,7 @@ H5B_insert_helper(H5F_t *f, const haddr_t *addr, const H5B_class_t *type, assert(type); assert(type->decode); assert(type->cmp3); - assert(type->new); + assert(type->new_node); assert(lt_key); assert(lt_key_changed); assert(rt_key); @@ -1076,8 +1076,8 @@ H5B_insert_helper(H5F_t *f, const haddr_t *addr, const H5B_class_t *type, assert(0 == bt->level); bt->key[0].nkey = bt->native; bt->key[1].nkey = bt->native + type->sizeof_nkey; - if ((type->new) (f, H5B_INS_FIRST, bt->key[0].nkey, udata, - bt->key[1].nkey, bt->child + 0 /*out */ ) < 0) { + if ((type->new_node) (f, H5B_INS_FIRST, bt->key[0].nkey, udata, + bt->key[1].nkey, bt->child + 0/*out*/) < 0) { bt->key[0].nkey = bt->key[1].nkey = NULL; HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, H5B_INS_ERROR, "unable to create leaf node"); @@ -1152,8 +1152,8 @@ H5B_insert_helper(H5F_t *f, const haddr_t *addr, const H5B_class_t *type, } my_ins = H5B_INS_LEFT; HDmemcpy(md_key, bt->key[idx].nkey, type->sizeof_nkey); - if ((type->new) (f, H5B_INS_LEFT, bt->key[idx].nkey, udata, md_key, - &child_addr /*out */ ) < 0) { + if ((type->new_node) (f, H5B_INS_LEFT, bt->key[idx].nkey, udata, + md_key, &child_addr/*out*/) < 0) { HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert minimum leaf node"); } @@ -1209,8 +1209,8 @@ H5B_insert_helper(H5F_t *f, const haddr_t *addr, const H5B_class_t *type, } my_ins = H5B_INS_RIGHT; HDmemcpy(md_key, bt->key[idx + 1].nkey, type->sizeof_nkey); - if ((type->new) (f, H5B_INS_RIGHT, md_key, udata, - bt->key[idx + 1].nkey, &child_addr /*out */ ) < 0) { + if ((type->new_node) (f, H5B_INS_RIGHT, md_key, udata, + bt->key[idx + 1].nkey, &child_addr/*out*/) < 0) { HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, H5B_INS_ERROR, "can't insert maximum leaf node"); } |