mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-17 16:50:18 +08:00
merged ejh_more_warnings
This commit is contained in:
commit
8e47b9bbc2
@ -1152,7 +1152,6 @@ NC4_def_var_filter(int ncid, int varid, unsigned int id, size_t nparams, const u
|
||||
NC_GRP_INFO_T *grp;
|
||||
NC_HDF5_FILE_INFO_T *h5;
|
||||
NC_VAR_INFO_T *var;
|
||||
NC_DIM_INFO_T *dim;
|
||||
|
||||
LOG((2, "%s: ncid 0x%x varid %d", __func__, ncid, varid));
|
||||
|
||||
|
@ -648,7 +648,6 @@ convertFilterID(const char* id)
|
||||
{
|
||||
unsigned int nid = 0;
|
||||
int ok = 0;
|
||||
struct FilterID* f;
|
||||
|
||||
/* for now, must be an integer */
|
||||
ok = sscanf(id,"%u",&nid);
|
||||
|
@ -57,7 +57,6 @@ main(int argc, char **argv)
|
||||
char testfile[NC_MAX_NAME];
|
||||
int format[MAX_NUM_FORMATS];
|
||||
int num_formats;
|
||||
int f = 0;
|
||||
int i, nerrs = 0;
|
||||
|
||||
ncopts &= ~NC_FATAL; /* make errors nonfatal */
|
||||
|
@ -6,8 +6,6 @@
|
||||
#include "occompile.h"
|
||||
#include "ocdebug.h"
|
||||
|
||||
static const unsigned int MAX_UINT = 0xffffffff;
|
||||
|
||||
static OCerror mergedas1(OCnode* dds, OCnode* das);
|
||||
static OCerror mergedods1(OCnode* dds, OCnode* das);
|
||||
static OCerror mergeother1(OCnode* root, OCnode* das);
|
||||
|
@ -204,9 +204,7 @@ static int
|
||||
readfile(const char* path, const char* suffix, NCbytes* packet)
|
||||
{
|
||||
int stat = OC_NOERR;
|
||||
char buf[1024];
|
||||
char filename[1024];
|
||||
int flags = 0;
|
||||
/* check for leading file:/// */
|
||||
if(ocstrncmp(path,"file://",7)==0) path += 7; /* assume absolute path*/
|
||||
if(!occopycat(filename,sizeof(filename),2,path,(suffix != NULL ? suffix : "")))
|
||||
|
Loading…
Reference in New Issue
Block a user