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/H5Oshared.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/H5Oshared.c')
| -rw-r--r-- | src/H5Oshared.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Oshared.c b/src/H5Oshared.c index dafe3d2..ff31b52 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -134,7 +134,7 @@ H5O_shared_read(H5F_t *f, hid_t dxpl_id, const H5O_shared_t *shared, HDassert(shared->flags & H5O_COMMITTED_FLAG); /* Get the shared message from an object header */ - if(NULL == (ret_value = H5O_msg_read(&(shared->u.oloc), type->id, 0, NULL, dxpl_id))) + if(NULL == (ret_value = H5O_msg_read(&(shared->u.oloc), type->id, NULL, dxpl_id))) HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message") } /* end else */ @@ -440,7 +440,7 @@ H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg) */ herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, const H5O_shared_t *sh_mesg, - const H5O_msg_class_t *type, hbool_t adj_link) + const H5O_msg_class_t *type) { herr_t ret_value = SUCCEED; /* Return value */ @@ -459,10 +459,9 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, const H5O_shared_t *sh_mesg, * be decremented when they're deleted (in H5O_shared_link_adj). */ - /* Decrement the reference count on the shared object, if requested */ - if(adj_link) - if(H5O_shared_link_adj(f, dxpl_id, sh_mesg, type, -1) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count") + /* Decrement the reference count on the shared object */ + if(H5O_shared_link_adj(f, dxpl_id, sh_mesg, type, -1) < 0) + HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count") done: FUNC_LEAVE_NOAPI(ret_value) |