mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

converting NULL checking of put functions

Browse Source
This commit is contained in:
Ed Hartnett 2018-08-14 09:21:45 -06:00
parent 829d9d28ae
commit 9953e53573
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libdispatch/dvarget.c
View File

@ -646,19 +646,24 @@ NC_get_varm(int ncid, int varid, const size_t *start,
void *value, nc_type memtype)
{
NC* ncp;
int rank;
int stat = NC_check_id(ncid, &ncp);
size_t *my_count = (size_t *)edges;
ptrdiff_t *my_stride = (ptrdiff_t *)stride;
int stat;
stat = NC_check_id(ncid, &ncp);
if(stat != NC_NOERR) return stat;
/* Non-scalar vars require start array. */
if(start == NULL) {
stat = nc_inq_varndims(ncid, varid, &rank);
/* Handle any NULL parameters. */
if(start == NULL || edges == NULL || stride == NULL) {
stat = NC_check_nulls(ncid, varid, start, &my_count, &my_stride);
if(stat != NC_NOERR) return stat;
if(rank > 0) return NC_EINVALCOORDS;
}
return ncp->dispatch->get_varm(ncid,varid,start,edges,stride,map,value,memtype);
stat = ncp->dispatch->get_varm(ncid, varid, start, my_count, my_stride,
map, value, memtype);
if(edges == NULL) free(my_count);
if(stride == NULL) free(my_stride);
return stat;
}
/** \name Reading Data from Variables

28
libdispatch/dvarput.c
View File

@ -553,8 +553,8 @@ NC_put_vars(int ncid, int varid, const size_t *start,
if(stat != NC_NOERR) return stat;
}
stat = ncp->dispatch->put_vars(ncid,varid,start,my_count,my_stride,
value,memtype);
stat = ncp->dispatch->put_vars(ncid, varid, start, my_count, my_stride,
value, memtype);
if(edges == NULL) free(my_count);
if(stride == NULL) free(my_stride);
return stat;
@ -569,18 +569,24 @@ NC_put_varm(int ncid, int varid, const size_t *start,
const void *value, nc_type memtype)
{
NC* ncp;
int varndims;
int status;
int stat = NC_check_id(ncid, &ncp);
size_t *my_count = (size_t *)edges;
ptrdiff_t *my_stride = (ptrdiff_t *)stride;
int stat;
stat = NC_check_id(ncid, &ncp);
if(stat != NC_NOERR) return stat;
/* Only scalar vars may have null starts. */
if(start == NULL) {
status = nc_inq_varndims(ncid, varid, &varndims);
if(status != NC_NOERR) return status;
if(varndims > 0) return NC_EINVALCOORDS;
/* Handle any NULL parameters. */
if(start == NULL || edges == NULL || stride == NULL) {
stat = NC_check_nulls(ncid, varid, start, &my_count, &my_stride);
if(stat != NC_NOERR) return stat;
}
return ncp->dispatch->put_varm(ncid,varid,start,edges,stride,map,value,memtype);
stat = ncp->dispatch->put_varm(ncid, varid, start, my_count, my_stride,
map, value, memtype);
if(edges == NULL) free(my_count);
if(stride == NULL) free(my_stride);
return stat;
}
/** \name Writing Data to Variables