diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-14 02:29:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-14 02:29:15 (GMT) |
| commit | 0b1bb5bda1296bb89d48c7542883ea25a5fb2174 (patch) | |
| tree | 563f70f8b154cb91adeb3026932a93dd1cea4e41 /src/H5Gstab.c | |
| parent | f494ab7674dc39225deb4a06ba211f82f3e9df5e (diff) | |
| download | hdf5-0b1bb5bda1296bb89d48c7542883ea25a5fb2174.zip hdf5-0b1bb5bda1296bb89d48c7542883ea25a5fb2174.tar.gz hdf5-0b1bb5bda1296bb89d48c7542883ea25a5fb2174.tar.bz2 | |
[svn-r12907] Description:
Finish refactoring internal link deletion code, to make it possible to
wrap up the H5Ldelete_by_idx() coding.
Tested on:
Linxu/32 2.6 (chicago)
Linxu/64 2.6 (chicago2)
Diffstat (limited to 'src/H5Gstab.c')
| -rw-r--r-- | src/H5Gstab.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/H5Gstab.c b/src/H5Gstab.c index 4a0d46a..ec813d8 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -293,7 +293,8 @@ done: *------------------------------------------------------------------------- */ herr_t -H5G_stab_remove(H5O_loc_t *loc, const char *name, H5G_obj_t *obj_type, hid_t dxpl_id) +H5G_stab_remove(H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, + const char *name) { H5O_stab_t stab; /*symbol table message */ H5G_bt_ud2_t udata; /*data to pass through B-tree */ @@ -312,7 +313,7 @@ H5G_stab_remove(H5O_loc_t *loc, const char *name, H5G_obj_t *obj_type, hid_t dxp udata.common.name = name; udata.common.heap_addr = stab.heap_addr; udata.adj_link = TRUE; - udata.obj_type = obj_type; + udata.grp_full_path_r = grp_full_path_r; /* Remove from symbol table */ if(H5B_remove(loc->file, dxpl_id, H5B_SNODE, stab.btree_addr, &udata) < 0) @@ -485,7 +486,7 @@ static herr_t H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata) { H5G_bt_it_idx1_t *udata = (H5G_bt_it_idx1_t *)_udata; - const H5HL_t *heap = NULL; /* Pointer to local heap for group */ + H5HL_t *heap = NULL; /* Pointer to local heap for group */ size_t name_off; /* Offset of name in heap */ const char *name; /* Pointer to name string in heap */ herr_t ret_value = SUCCEED; /* Return value */ @@ -803,7 +804,7 @@ static herr_t H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata) { H5G_bt_it_idx3_t *udata = (H5G_bt_it_idx3_t *)_udata; - const H5HL_t *heap; /* Pointer to local heap for group */ + H5HL_t *heap; /* Pointer to local heap for group */ size_t name_off; /* Offset of name in heap */ const char *name; /* Pointer to name string in heap */ size_t name_len; /* Length of link name */ |