mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-12 15:45:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Jira NCF-207: double call to del_from_NCLIST

Browse Source
This commit is contained in:
Dennis Heimbigner 2012-11-21 17:52:49 +00:00
parent 876861cc07
commit a53682fc66
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cf
View File

@ -7,7 +7,7 @@ if test $# != 0 ; then
cmds=$@
fi
HDF5=1
#HDF5=1
DAP=1
#CDMR=1
#RPC=1
@ -137,7 +137,7 @@ FLAGS="$FLAGS --disable-pnetcdf"
#FLAGS="$FLAGS --enable-benchmarks"
FLAGS="$FLAGS --enable-extra-tests"
FLAGS="$FLAGS --enable-logging"
#FLAGS="$FLAGS --enable-large-file-tests"
FLAGS="$FLAGS --enable-large-file-tests"
#FLAGS="$FLAGS --disable-testsets"
#FLAGS="$FLAGS --disable-dap-remote-tests"
#FLAGS="$FLAGS --enable-doxygen"

6
libsrc/nc3internal.c
View File

@ -1097,7 +1097,7 @@ NC3_close(int ncid)
status = NC_endef(nc3, 0, 1, 0, 1); /* TODO: defaults */
if(status != NC_NOERR )
{
(void) nc_abort(ncid);
(void) NC3_abort(ncid); /* do not use nc_abort */
return status;
}
}
@ -1549,14 +1549,14 @@ nc_delete_mp(const char * path, int basepe)
{
/* Not a netcdf file, don't delete */
/* ??? is this the right semantic? what if it was just too big? */
(void)nc_abort(ncid);
(void)NC3_abort(ncid);
}
else
{
/* ncio_abort does the unlink */
/*cheat and mark the file as new */
fSet((nc3)->nciop->ioflags,NC_WRITE);
(void)nc_abort(ncid);
(void)NC3_abort(ncid);
}
return status;
}