cdfScanVarAttributes: cleanup warning message

configure

@@ -812,6 +812,7 @@ enable_dependency_tracking
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_gnu_ld
 enable_largefile
 with_threads
 with_zlib
@@ -843,16 +844,25 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
+CPPFLAGS
 FC
 FCFLAGS
+LDFLAGS
+LIBS
 FPP
 FPPFLAGS
 F77
 FFLAGS
+LDFLAGS
+LIBS
 CXX
 CXXFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
 CCC
 CXXCPP
+CPPFLAGS
 FCMODEXT'

src/stream_cdf.c

@@ -4336,8 +4336,8 @@ int cmpvarname(const void *s1, const void *s2)
 
 #if  defined  (HAVE_LIBNETCDF)
 static
-void scanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
-                       int timedimid, int modelID, int format)
+void cdfScanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
+                          int timedimid, int modelID, int format)
 {
   int ncvarid;
   int ncdimid;
@@ -4473,7 +4473,7 @@ void scanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
                   if ( warn )
                     {
                       warn = FALSE;
-                      Warning("Grid type %s unsupported!", attstring);
+                      Warning("netCDF attribute grid_type='%s' unsupported!", attstring);
                     }
                 }
 
@@ -4496,7 +4496,7 @@ void scanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
                   if ( warn )
                     {
                       warn = FALSE;
-                      Warning("Zaxis type %s unsupported!", attstring);
+                      Warning("netCDF attribute level_type='%s' unsupported!", attstring);
                     }
                 }
 
@@ -6303,8 +6303,8 @@ int cdfInqContents(int streamID)
     }
 
 
-  /* scan var attributes */
-  scanVarAttributes(fileID, nvars, ncvars, ncdims, timedimid, modelID, format);
+  /* scan attributes of all variables */
+  cdfScanVarAttributes(fileID, nvars, ncvars, ncdims, timedimid, modelID, format);
 
 
   if ( CDI_Debug ) printNCvars(ncvars, nvars);

src/stream_gribapi.c

@@ -843,7 +843,7 @@ int gribapiScanTimestep1(int streamID)
 	      dlevel = grib1GetLevel(gh, leveltype);
 	      if ( leveltype == 99 ) leveltype++;
 	    }
-	  else 
+	  else
 	    {
 	      leveltype = 0;
 	      dlevel = 0;
@@ -860,7 +860,7 @@ int gribapiScanTimestep1(int streamID)
 	      // fprintf(stderr, "packingType %d %s\n", len, typeOfPacking);
 	      if ( strncmp(typeOfPacking, "grid_jpeg", len) == 0 ) comptype = COMPRESS_JPEG;
 	    }
-	  
+
 	  GRIB_CHECK(grib_get_long(gh, "discipline", &lpar), 0);
 	  pdis = (int) lpar;
 
@@ -879,7 +879,7 @@ int gribapiScanTimestep1(int streamID)
 	      dlevel = grib2GetLevel(gh, leveltype);
 	      if ( leveltype == 99 ) leveltype++;
 	    }
-	  else 
+	  else
 	    {
 	      leveltype = 0;
 	      dlevel = 0;
@@ -943,7 +943,7 @@ int gribapiScanTimestep1(int streamID)
 		if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 )
 		  {
 		    char paramstr[32];
-		    cdiParamToString(param, paramstr, sizeof(paramstr));	    
+		    cdiParamToString(param, paramstr, sizeof(paramstr));
 		    Warning("Inconsistent verification time (param=%s level=%d)", paramstr, level1);
 		    warn_time = FALSE;
 		  }