mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc. typos from previous commit

Browse Source
This commit is contained in:
dmh 2014-06-02 14:02:34 -06:00
parent 909940f9d3
commit ed068ef643
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdap2/getvara.c
View File

@ -39,6 +39,7 @@ static int extract(NCDAPCOMMON*, Getvara*, CDFnode*, DCEsegment*, size_t diminde
static int extractstring(NCDAPCOMMON*, Getvara*, CDFnode*, DCEsegment*, size_t dimindex, OClink, OCdatanode, struct NCMEMORY*);
static void freegetvara(Getvara* vara);
static NCerror makegetvar(NCDAPCOMMON*, CDFnode*, void*, nc_type, Getvara**);
static NCerror attachsubset(CDFnode* target, CDFnode* template);
/**************************************************/
/**
@ -1154,7 +1155,7 @@ template tree is typically a structural superset of target tree.
WARNING: Dimensions are not attached
*/
NCerror
static NCerror
attachsubset(CDFnode* target, CDFnode* template)
{
NCerror ncstat = NC_NOERR;

7
libdap2/ncd2dispatch.c
View File

@ -5,6 +5,7 @@
#include "ncdap.h"
#include "ncd2dispatch.h"
#include "dapalign.h"
#ifdef HAVE_GETRLIMIT
# ifdef HAVE_SYS_RESOURCE_H
@ -399,9 +400,9 @@ NCD2_open(const char * path, int mode,
ncloginit();
if(nclogopen(value))
ncsetlogging(1);
ocloginit();
if(oclogopen(value))
ocsetlogging(1);
ncloginit();
if(nclogopen(value))
ncsetlogging(1);
}
/* fetch and build the unconstrained DDS for use as

1
libsrc4/nc4hdf.c
View File

@ -1417,6 +1417,7 @@ var_create_dataset(NC_GRP_INFO_T *grp, NC_VAR_INFO_T *var, int write_dimid)
if(!var->shuffle && !var->deflate && !var->options_mask &&
!var->fletcher32 && (var->chunksizes == NULL || !var->chunksizes[0])) {
#ifdef USE_HDF4
NC_HDF5_FILE_INFO_T *h5 = grp->nc4_info;
if(h5->hdf4 || !unlimdim)
#else
if(!unlimdim)

3
libsrc4/nc4var.c
View File

@ -807,7 +807,7 @@ nc_def_var_extra(int ncid, int varid, int *shuffle, int *deflate,
NC_DIM_INFO_T *dim;
int d;
int retval;
nc_bool_t ishdf4 = NC_FALSE; /* Use this to avoid so many ifdefs
nc_bool_t ishdf4 = NC_FALSE; /* Use this to avoid so many ifdefs */
LOG((2, "%s: ncid 0x%x varid %d", __func__, ncid, varid));
@ -1016,6 +1016,7 @@ nc_inq_var_chunking_ints(int ncid, int varid, int *contiguousp, int *chunksizesp
NC *nc;
NC_GRP_INFO_T *grp;
NC_VAR_INFO_T *var;
NC_HDF5_FILE_INFO_T *h5;
size_t *cs = NULL;
int i, retval;

2
oc2/ochttp.c
View File

@ -97,7 +97,6 @@ ocfetchurl(CURL* curl, const char* url, OCbytes* buf, long* filetime,
CURLcode cstat = CURLE_OK;
size_t len;
long httpcode = 0;
char tbuf[1024];
/* Set the URL */
cstat = curl_easy_setopt(curl, CURLOPT_URL, (void*)url);
if (cstat != CURLE_OK)
@ -114,6 +113,7 @@ ocfetchurl(CURL* curl, const char* url, OCbytes* buf, long* filetime,
if (cstat != CURLE_OK)
goto fail;
#else
char tbuf[1024];
snprintf(tbuf,1023,"%s:%s",creds->username,creds->password);
cstat = curl_easy_setopt(curl, CURLOPT_USERPWD, tbuf);
if (cstat != CURLE_OK)