Merge pull request Unidata#9 from NetCDF-World-Domination-Council/ejh…

…_rename_is_coming Merged some fixes from Greg
NetCDF-World-Domination-Council · Jan 31, 2018 · 29b49e3 · 29b49e3
2 parents 3e170d1 + 18cf0b5
commit 29b49e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libsrc4/nc4grp.c b/libsrc4/nc4grp.c
@@ -478,7 +478,7 @@ NC4_inq_varids(int ncid, int *nvars, int *varids)
    NC_GRP_INFO_T *grp;
    NC_HDF5_FILE_INFO_T *h5;
    NC_VAR_INFO_T *var;
-   int v, num_vars = 0;
+   int num_vars = 0;
    int retval;
    int i;
 
@@ -547,7 +547,7 @@ NC4_inq_dimids(int ncid, int *ndims, int *dimids, int include_parents)
    NC_GRP_INFO_T *grp, *g;
    NC_HDF5_FILE_INFO_T *h5;
    NC_DIM_INFO_T *dim;
-   int d, num = 0;
+   int num = 0;
    int retval;
 
    LOG((2, "nc_inq_dimids: ncid 0x%x include_parents: %d", ncid, 

diff --git a/nc_test4/tst_grps.c b/nc_test4/tst_grps.c
@@ -41,7 +41,7 @@ main(int argc, char **argv)
       int henry_vii_id;
       int henry_viii_id;
       int grpid_in[MAX_SIBLING_GROUPS], varids_in[MAX_SIBLING_GROUPS];
-      int dimids_in[MAX_SIBLING_GROUPS], nvars_in, ndims_in, ncid_in;
+      int nvars_in, ncid_in;
       int parent_ncid;
       char name_out[NC_MAX_NAME + 1];
       int num_grps;
@@ -114,13 +114,13 @@ main(int argc, char **argv)
       /* Create a classic model file. No groups will be allowed. */
       if (nc_create(FILE_NAME_CLASSIC_MODEL, NC_NETCDF4|NC_CLASSIC_MODEL, &ncid2)) ERR;
       if (nc_def_grp(ncid2, HENRY_VII, &henry_vii_id) != NC_ESTRICTNC3) ERR;
-      if (nc_def_var(ncid2, HENRY_IV, NC_INT, 0, NULL, NULL));
+      if (nc_def_var(ncid2, HENRY_IV, NC_INT, 0, NULL, NULL)) ERR;
       if (nc_close(ncid2)) ERR;
 
       /* Create a file with one group, a group to contain data about
        * Henry VII. */
       if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR;
-      if (nc_def_var(ncid, HENRY_IV, NC_INT, 0, NULL, NULL));      
+      if (nc_def_var(ncid, HENRY_IV, NC_INT, 0, NULL, NULL)) ERR;      
 
       /* Turn off define mode. It will automatically be turned back on
        * when nc_def_grp is called. */

diff --git a/nc_test4/tst_types.c b/nc_test4/tst_types.c
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
          /* Create a var... */
          sprintf(varname, "var_%d", type);
          if (nc_def_var(ncid1, varname, type + NC_UBYTE, 1, &dimid, &varid[type])) ERR;
-         if (nc_inq_type_equal(ncid1, type + NC_UBYTE, ncid2, type + NC_UBYTE, &equal));
+         if (nc_inq_type_equal(ncid1, type + NC_UBYTE, ncid2, type + NC_UBYTE, &equal)) ERR;
          if (!equal) ERR;
       }
       nc_close(ncid2);