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

fixed merge issue

Browse Source
This commit is contained in:
Ed Hartnett 2018-02-14 07:58:50 -07:00
parent 41eb0f26c1
commit b0a8d4ee30
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nc_test4/tst_vars2.c
View File

@ -777,9 +777,8 @@ main(int argc, char **argv)
int dimids[NDIMS5], dimids_in[NDIMS5];
int varid, varid1, varid2, varid3, varid4;
int varids_in4[NVAR4] = {0};
int varids_in4[NVAR4];
int ndims, nvars, natts, unlimdimid;
int varids_in[NVAR4];
nc_type xtype_in;
char name_in[NC_MAX_NAME + 1];
int data[DIM5_LEN], data_in[DIM5_LEN];
@ -851,9 +850,9 @@ main(int argc, char **argv)
if (nc_inq(ncid, &ndims, &nvars, &natts, &unlimdimid)) ERR;
if (ndims != NDIMS5 || nvars != 1 || natts != 0 ||
unlimdimid != -1) ERR;
if (nc_inq_varids(ncid, &nvars, varids_in)) ERR;
if (nc_inq_varids(ncid, &nvars, varids_in4)) ERR;
if (nvars != 1) ERR;
if (varids_in[0] != 0) ERR;
if (varids_in4[0] != 0) ERR;
if (nc_inq_var(ncid, 0, name_in, &xtype_in, &ndims, dimids_in, &natts)) ERR;
if (strcmp(name_in, VAR_NAME5) || xtype_in != NC_INT || ndims != 1 || natts != 0 ||
dimids_in[0] != 0) ERR;