From a53682fc66df689c7276506c6149fb18dad8f224 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Wed, 21 Nov 2012 17:52:49 +0000 Subject: [PATCH] fix Jira NCF-207: double call to del_from_NCLIST --- cf | 4 ++-- libsrc/nc3internal.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cf b/cf index 4e67d30e9..3c2dcf4c8 100644 --- a/cf +++ b/cf @@ -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" diff --git a/libsrc/nc3internal.c b/libsrc/nc3internal.c index 79cdff6cf..922fb3997 100644 --- a/libsrc/nc3internal.c +++ b/libsrc/nc3internal.c @@ -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; }