mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r27834] Description:

Browse Source 
Close FAPL for external link test, to fix infinite loop closing the library.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial 
    (too minor to require h5committest)
This commit is contained in:
Quincey Koziol 2015-09-20 21:08:56 -05:00
parent 502dd5500b
commit 8fc9a9ba25
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5.c
View File

@ -333,8 +333,8 @@ H5_term_library(void)
if(pending == 0) { if(pending == 0) {
pending += DOWN(AC); pending += DOWN(AC);
pending += DOWN(Z); pending += DOWN(Z);
pending += DOWN(FD);
pending += DOWN(P); pending += DOWN(P);
pending += DOWN(FD);
pending += DOWN(PL); pending += DOWN(PL);
/* Don't shut down the error code until other APIs which use it are shut down */ /* Don't shut down the error code until other APIs which use it are shut down */
if(pending == 0) if(pending == 0)

6
test/links.c
View File

@ -6234,7 +6234,7 @@ error:
static int static int
external_link_strong(hid_t fapl, hbool_t new_format) external_link_strong(hid_t fapl, hbool_t new_format)
{ {
hid_t my_fapl; /* File access property list */ hid_t my_fapl = (-1); /* File access property list */
hid_t fid1 = (-1), fid2 = (-1); /* File ID */ hid_t fid1 = (-1), fid2 = (-1); /* File ID */
hid_t gid1 = (-1), gid2 = (-1); /* Group IDs */ hid_t gid1 = (-1), gid2 = (-1); /* Group IDs */
char objname[NAME_BUF_SIZE]; /* Object name */ char objname[NAME_BUF_SIZE]; /* Object name */
@ -6283,11 +6283,15 @@ external_link_strong(hid_t fapl, hbool_t new_format)
if(H5Gclose(gid2) < 0) TEST_ERROR if(H5Gclose(gid2) < 0) TEST_ERROR
if(H5Fclose(fid2) < 0) TEST_ERROR if(H5Fclose(fid2) < 0) TEST_ERROR
/* Close fapl */
if(H5Pclose(my_fapl) < 0) TEST_ERROR
PASSED(); PASSED();
return 0; return 0;
error: error:
H5E_BEGIN_TRY { H5E_BEGIN_TRY {
H5Pclose(my_fapl);
H5Gclose(fapl); H5Gclose(fapl);
H5Gclose(gid2); H5Gclose(gid2);
H5Gclose(gid1); H5Gclose(gid1);