mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
sync with PnetCDF on use of NC_ENULLSTART and NC_ENULLCOUNT
This commit is contained in:
parent
5137be27d1
commit
e357696c8d
@ -118,8 +118,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -363,8 +363,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
err = GetVara($1)(ncid, i, start, NULL, value);
|
||||
@ -373,8 +373,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -575,8 +575,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
err = GetVars($1)(ncid, i, start, NULL, NULL, value);
|
||||
@ -585,8 +585,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -797,8 +797,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
err = GetVarm($1)(ncid, i, start, NULL, NULL, NULL, value);
|
||||
@ -807,8 +807,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
|
@ -391,8 +391,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -675,8 +675,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
for (j=0; j<var_rank[i]; j++) start[j] = 0;
|
||||
@ -686,8 +686,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -888,8 +888,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
for (j=0; j<var_rank[i]; j++) start[j] = 0;
|
||||
@ -899,8 +899,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
@ -1101,8 +1101,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLSTART)
|
||||
error("expecting NC_ENULLSTART, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EINVALCOORDS)
|
||||
error("expecting NC_EINVALCOORDS, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
|
||||
for (j=0; j<var_rank[i]; j++) start[j] = 0;
|
||||
@ -1112,8 +1112,8 @@ ifdef(`PNETCDF',`dnl
|
||||
error("expecting NC_ECHAR, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
}
|
||||
else IF (var_rank[i] > 0 && err != NC_ENULLCOUNT)
|
||||
error("expecting NC_ENULLCOUNT, but got %s", nc_err_code_name(err));
|
||||
else IF (var_rank[i] > 0 && err != NC_EEDGE)
|
||||
error("expecting NC_EEDGE, but got %s", nc_err_code_name(err));
|
||||
ELSE_NOK
|
||||
')dnl
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user