synch with oc2.0

This commit is contained in:
dmh 2014-03-03 13:43:47 -07:00
parent 805a6f5b58
commit ba726d55ce
3 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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 \

View File

@ -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;
}