Change some struct member types to avoid conversion warnings

This commit is contained in:
Peter Hill 2024-03-25 10:56:19 +00:00
parent 6f092f01ec
commit 607ae02f0a
No known key found for this signature in database
GPG Key ID: 0C6B9742E72848EE
5 changed files with 7 additions and 7 deletions

View File

@ -255,7 +255,7 @@ buildDimension(NCD4meta* builder, NCD4node* dim)
if(dim->dim.isunlimited) {
NCCHECK((nc_def_dim(group->meta.id,dim->name,NC_UNLIMITED,&dim->meta.id)));
} else {
NCCHECK((nc_def_dim(group->meta.id,dim->name,(size_t)dim->dim.size,&dim->meta.id)));
NCCHECK((nc_def_dim(group->meta.id,dim->name,dim->dim.size,&dim->meta.id)));
}
done:
return THROW(ret);

View File

@ -7,7 +7,7 @@
#define D4ODOM_H 1
typedef struct D4odometer {
int rank;
size_t rank;
size_t index[NC_MAX_VAR_DIMS];
size_t start[NC_MAX_VAR_DIMS];
#if 0

View File

@ -288,7 +288,7 @@ parseDimensions(NCD4parser* parser, NCD4node* group, ncxml_t xml)
if((ret = parseULL(sizestr,&size))) goto done;
nullfree(sizestr);
if((ret=makeNode(parser,group,x,NCD4_DIM,NC_NULL,&dimnode))) goto done;
dimnode->dim.size = (long long)size;
dimnode->dim.size = size;
dimnode->dim.isunlimited = (unlimstr != NULL);
nullfree(unlimstr);
/* Process attributes */
@ -1369,7 +1369,7 @@ makeAnonDim(NCD4parser* parser, const char* sizestr)
if(dim == NULL) {/* create it */
if((ret=makeNode(parser,root,NULL,NCD4_DIM,NC_NULL,&dim))) goto done;
SETNAME(dim,name+1); /* leave out the '/' separator */
dim->dim.size = (long long)size;
dim->dim.size = (size_t)size;
dim->dim.isanonymous = 1;
classify(root,dim);
}

View File

@ -69,7 +69,7 @@ NCD4_get_vars(int gid, int varid,
/* build size vector */
for(i=0;i<rank;i++) {
NCD4node* dim = nclistget(ncvar->dims,i);
dimsizes[i] = (size_t)dim->dim.size;
dimsizes[i] = dim->dim.size;
}
/* Extract and desired subset of data */

View File

@ -206,10 +206,10 @@ struct NCD4node {
NClist* values;
} attr;
struct { /* sort == NCD4_OPAQUE */
long long size; /* 0 => var length */
size_t size; /* 0 => var length */
} opaque;
struct { /* sort == NCD4_DIMENSION */
long long size;
size_t size;
int isunlimited;
int isanonymous;
} dim;