diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-05 22:26:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-02-05 22:26:44 (GMT) |
| commit | c560e68258bef4235fac0cebfe65e8850e25b61d (patch) | |
| tree | 2ea489afcde3124fcb648161b41bd4101618e9df /src/H5Gnode.c | |
| parent | 51875fc8881cdfa0c939fba82b7a00012a2c611e (diff) | |
| download | hdf5-c560e68258bef4235fac0cebfe65e8850e25b61d.zip hdf5-c560e68258bef4235fac0cebfe65e8850e25b61d.tar.gz hdf5-c560e68258bef4235fac0cebfe65e8850e25b61d.tar.bz2 | |
[svn-r13240] Description:
More cleanups on the object header message handling code, to make it
easier to work with and move forward on the creation order coding.
Various other minor cleanups & warning fixes.
Tested on:
FreeBSD/32 6.2 (duty)
Diffstat (limited to 'src/H5Gnode.c')
| -rw-r--r-- | src/H5Gnode.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 0c23524..ee22ef2 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1276,8 +1276,8 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/, if(H5G_link_name_replace(f, dxpl_id, udata->grp_full_path_r, s, lnk_type, lnk_addr) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object type") - /* Decrement the ref. count for hard links, if requested */ - if(lnk_type == H5L_TYPE_HARD && udata->adj_link) { + /* Decrement the ref. count for hard links */ + if(lnk_type == H5L_TYPE_HARD) { H5O_loc_t tmp_oloc; /* Temporary object location */ /* Build temporary object location */ @@ -1359,14 +1359,12 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/, /* Reduce the link count for all entries in this node */ for(idx = 0; idx < sn->nsyms; idx++) { if(!(H5G_CACHED_SLINK == sn->entry[idx].type)) { - /* Decrement the reference count, if requested */ - if(udata->adj_link) { - HDassert(H5F_addr_defined(sn->entry[idx].header)); - tmp_oloc.addr = sn->entry[idx].header; + /* Decrement the reference count */ + HDassert(H5F_addr_defined(sn->entry[idx].header)); + tmp_oloc.addr = sn->entry[idx].header; - if(H5O_link(&tmp_oloc, -1, dxpl_id) < 0) - HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR, "unable to decrement object link count") - } /* end if */ + if(H5O_link(&tmp_oloc, -1, dxpl_id) < 0) + HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, H5B_INS_ERROR, "unable to decrement object link count") } /* end if */ } /* end for */ |