mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
synch with oc2.0
This commit is contained in:
parent
805a6f5b58
commit
ba726d55ce
@ -6,7 +6,7 @@ alias q0=;alias qq=;alias qv=;alias q=;alias qh=;alias qqh=;alias qall=;alias q
|
||||
#TOP="/home/dmh/mach/netcdf-c"
|
||||
TOP="/cygdrive/f/git/netcdf-c"
|
||||
|
||||
F="http://tigge:tiggeUser@thredds-test.ucar.edu/thredds/dodsC/restrict/testData.nc"
|
||||
F="http://tiggeUser:tigge@thredds-test.ucar.edu/thredds/dodsC/restrict/testData.nc"
|
||||
|
||||
#CON='SPEED.SPEED'
|
||||
#VAR=SPEED
|
||||
|
@ -1,6 +1,6 @@
|
||||
THISDIR=../oc2
|
||||
OCDIR=/home/dmh/svn/oc2.0
|
||||
#OCDIR=f:/svn/oc2.0
|
||||
#OCDIR=/home/dmh/svn/oc2.0
|
||||
OCDIR=f:/svn/oc2.0
|
||||
|
||||
# Make consistent with Makefile.am
|
||||
SRC=oc.c \
|
||||
|
@ -726,12 +726,12 @@ ocmktmp(const char* base, char** tmpnamep, int* fdp)
|
||||
}
|
||||
#endif /* !HAVE_MKSTEMP */
|
||||
if(fd < 0) {
|
||||
free(tmpname);
|
||||
if(tmpname != NULL) free(tmpname);
|
||||
return OC_EOPEN;
|
||||
}
|
||||
if(tmpnamep) *tmpnamep = tmpname;
|
||||
else free(tmpname);
|
||||
else if(tmpname != null) {free(tmpname);}
|
||||
if(fdp) *fdp = fd;
|
||||
else if(fd) close(fd);
|
||||
else if(fd >= 0) close(fd);
|
||||
return OC_NOERR;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user