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

removed non-relaxed coord bounds from test code

Browse Source
This commit is contained in:
Edward Hartnett 2019-11-26 06:20:34 -07:00
parent 8c648b5a2d
commit 64d821b568
6 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libdispatch/dvarget.c
View File

@ -226,11 +226,8 @@ NCDEFAULT_get_vars(int ncid, int varid, const size_t * start,
/* illegal value checks */
dimlen = (i == 0 && isrecvar ? numrecs : varshape[i]);
/* mystart is unsigned, never < 0 */
#ifdef RELAX_COORD_BOUND
if (mystart[i] > dimlen) return NC_EINVALCOORDS;
#else
if (mystart[i] >= dimlen) return NC_EINVALCOORDS;
#endif
if(edges == NULL) {
if(i == 0 && isrecvar)
myedges[i] = numrecs - start[i];
@ -238,9 +235,9 @@ NCDEFAULT_get_vars(int ncid, int varid, const size_t * start,
myedges[i] = varshape[i] - mystart[i];
} else
myedges[i] = edges[i];
#ifdef RELAX_COORD_BOUND
if (mystart[i] == dimlen && myedges[i] > 0) return NC_EINVALCOORDS;
#endif
/* myedges is unsigned, never < 0 */
if(mystart[i] + myedges[i] > dimlen)
return NC_EEDGE;
@ -416,11 +413,7 @@ NCDEFAULT_get_varm(int ncid, int varid, const size_t *start,
? start[idim]
: 0;
#ifdef RELAX_COORD_BOUND
if (mystart[idim] > dimlen)
#else
if (mystart[idim] >= dimlen)
#endif
{
status = NC_EINVALCOORDS;
goto done;
@ -441,13 +434,11 @@ NCDEFAULT_get_varm(int ncid, int varid, const size_t *start,
myedges[idim] = varshape[idim] - mystart[idim];
#endif
#ifdef RELAX_COORD_BOUND
if (mystart[idim] == dimlen && myedges[idim] > 0)
{
status = NC_EINVALCOORDS;
goto done;
}
#endif
if (mystart[idim] + myedges[idim] > dimlen)
{

2
nc_test/Makefile.am
View File

@ -127,7 +127,7 @@ endif
# Only clean these on maintainer-clean, because they require m4 to
# regenerate.
#MAINTAINERCLEANFILES = test_get.c test_put.c
MAINTAINERCLEANFILES = test_get.c test_put.c
# This rule tells make how to turn our .m4 files into .c files.
.m4.c:

5
nc_test/test_get.m4
View File

@ -487,13 +487,8 @@ ifelse(`$1',`uchar',`ifdef(`PNETCDF',,``#'endif')')
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
start[j] = var_shape[i][j]+1; /* should cause NC_EINVALCOORDS */
err = GetVara($1)(ncid, i, start, edge, value);
IF (err != NC_EINVALCOORDS)

15
nc_test/test_put.m4
View File

@ -778,13 +778,8 @@ ifdef(`PNETCDF',`dnl
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVara($1)(ncid, i, start, edge, value);
@ -1007,13 +1002,8 @@ ifdef(`PNETCDF',`dnl
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVars($1)(ncid, i, start, edge, stride, value);
@ -1259,13 +1249,8 @@ ifdef(`PNETCDF',`dnl
start[j] = 0;
continue;
}
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVarm($1)(ncid, i, start, edge, stride, imap, value);

15
nc_test/test_read.m4
View File

@ -1207,13 +1207,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == RECDIM) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = GetVara(ncid, i, start, edge, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = GetVara(ncid, i, start, edge, buf, 1, datatype);
@ -1399,13 +1394,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == RECDIM) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = GetVars(ncid, i, start, edge, stride, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = GetVars(ncid, i, start, edge, stride, buf, 1, datatype);
@ -1628,13 +1618,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == RECDIM) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = GetVarm(ncid, i, start, edge, stride, imap, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = GetVarm(ncid, i, start, edge, stride, imap, buf, 1, datatype);

15
nc_test/test_write.m4
View File

@ -1043,13 +1043,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == RECDIM) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = PutVara(ncid, i, start, edge, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVara(ncid, i, start, edge, buf, 1, datatype);
@ -1236,13 +1231,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == 0) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = PutVars(ncid, i, start, edge, stride, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVars(ncid, i, start, edge, stride, buf, 1, datatype);
@ -1459,13 +1449,8 @@ ifdef(`PNETCDF',`dnl
if (var_dimid[i][j] == 0) continue; /* skip record dim */
start[j] = var_shape[i][j];
err = PutVarm(ncid, i, start, edge, stride, imap, buf, 0, datatype);
#ifdef RELAX_COORD_BOUND
IF (err != NC_NOERR) /* allowed when edge[j]==0 */
EXPECT_ERR(NC_NOERR, err)
#else
IF (err != NC_EINVALCOORDS) /* not allowed even when edge[j]==0 */
EXPECT_ERR(NC_EINVALCOORDS, err)
#endif
ELSE_NOK
start[j] = var_shape[i][j]+1; /* out of boundary check */
err = PutVarm(ncid, i, start, edge, stride, imap, buf, 1, datatype);