Skip to content

Commit

Permalink
Fix dap4 related warnings in #501.
Browse files Browse the repository at this point in the history
The nc_test/util.c error is a typo. The libdap4/d4meta.c error only is shown
when using a 64 bit machine because then |size_t| == 64 bits
and |int| = 32bits.
  • Loading branch information
DennisHeimbigner committed Oct 21, 2017
1 parent a2964f5 commit c8b2184
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
8 changes: 4 additions & 4 deletions libdap4/d4meta.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static int decodeEconst(NCD4meta* builder, NCD4node* enumtype, const char* nameo
static int downConvert(union ATOMICS* converter, NCD4node* type);
static void freeStringMemory(char** mem, int count);
static size_t getDimrefs(NCD4node* var, int* dimids);
static size_t getDimsizes(NCD4node* var, size_t* dimsizes);
static size_t getDimsizes(NCD4node* var, int* dimsizes);
static void reclaimNode(NCD4node* node);
static d4size_t getpadding(d4size_t offset, size_t alignment);
static int markdapsize(NCD4meta* meta);
Expand Down Expand Up @@ -523,7 +523,7 @@ buildCompound(NCD4meta* builder, NCD4node* cmpdtype, NCD4node* group, char* name
/* Step 3: add the fields to type */
for(i=0;i<nclistlength(cmpdtype->vars);i++) {
int rank;
size_t dimsizes[NC_MAX_VAR_DIMS];
int dimsizes[NC_MAX_VAR_DIMS];
NCD4node* field = (NCD4node*)nclistget(cmpdtype->vars,i);
rank = nclistlength(field->dims);
if(rank == 0) { /* scalar */
Expand Down Expand Up @@ -681,13 +681,13 @@ getDimrefs(NCD4node* var, int* dimids)
}

static size_t
getDimsizes(NCD4node* var, size_t* dimsizes)
getDimsizes(NCD4node* var, int* dimsizes)
{
int i;
int rank = nclistlength(var->dims);
for(i=0;i<rank;i++) {
NCD4node* dim = (NCD4node*)nclistget(var->dims,i);
dimsizes[i] = dim->dim.size;
dimsizes[i] = (int)dim->dim.size;
}
return rank;
}
Expand Down
4 changes: 0 additions & 4 deletions nc_test/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ int
inRange(const double value, const nc_type xtype)
{
switch (xtype) {
double min = 0.0;
double max = 0.0;


case NC_CHAR: return value >= X_CHAR_MIN && value <= X_CHAR_MAX;
case NC_BYTE: return value >= X_BYTE_MIN && value <= X_BYTE_MAX;
case NC_SHORT: return value >= X_SHORT_MIN && value <= X_SHORT_MAX;
Expand Down

0 comments on commit c8b2184

Please sign in to comment.