summaryrefslogtreecommitdiffstats
path: root/src/H5O.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-01-23 04:53:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-01-23 04:53:22 (GMT)
commitab37aae39f7754827774577a0053e1b0979b3b1d (patch)
treef5b018adbd378048d6a8112ab94f873eeb5dddb1 /src/H5O.c
parente8538794ef18febaa471a2a81639c9a9ef7bfba1 (diff)
downloadhdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.zip
hdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.tar.gz
hdf5-ab37aae39f7754827774577a0053e1b0979b3b1d.tar.bz2
[svn-r18158] Description:
Bring r18157 from trunk to 1.8 branch: Bring back changes from Coverity session on 1/15/10: r18111: Fix Coverity issue #130: make certain that the cache gets freed on error. r18112: Fix Coverity issue #43 by making cache testing calls protected by 'pass' variable. r18113: Fix Coverity issue #129 by releasing the cache on error. r18115: Coverity #45 fix: patched an error check in H5Screate_simple to prevent future dereferencing of a NULL point. Added a verification in test/th5s.c. r18116: Fix Coverity issue #43 by releasing cache on error. r18117: Coverity #362,363 by adding HGOTO_DONE, freeing allocations and associated changes. REsolving coverity results #364-368, 369, 370-372, 377, 379, and 380. r18118: Fix Coverity issue #42: assert that cache & test specification pointer are valid. r18122: Coverity #362,363 by adding HGOTO_DONE and freeing allocations. This also takes care of #357,358. r18123: Coverity #359-361, 373-376: Added HGOTO_DONE(FAIL) statement after checking allocation for NULL. Verified allocation is freed in done block. r18128: Fixed coverity issue #10 -- removed dead code. Tested on: Mac OS X/32 10.6.2 (amazon)
Diffstat (limited to 'src/H5O.c')
-rw-r--r--src/H5O.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/H5O.c b/src/H5O.c
index 73860cd..33fd9b6 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -365,7 +365,6 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
H5G_loc_t obj_loc; /* Location used to open group */
H5G_name_t obj_path; /* Opened object group hier. path */
H5O_loc_t obj_oloc; /* Opened object object location */
- hbool_t loc_found = FALSE; /* Location at 'name' found */
hid_t lapl_id = H5P_LINK_ACCESS_DEFAULT; /* lapl to use to open this object */
hid_t ret_value = FAIL;
@@ -391,9 +390,6 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
done:
- if(ret_value < 0 && loc_found)
- if(H5G_loc_free(&obj_loc) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
FUNC_LEAVE_API(ret_value)
} /* end H5Oopen_by_addr() */