removed unused func variables

src/EcaIndices.c

@@ -328,7 +328,6 @@ void *EcaCsu(void *argument)
 
 void *EcaCwdi(void *argument)
 {
-  static const char *func = "EcaCwdi";
   char *longname;
   int argN = 6;
   double argT = 5.0;
@@ -372,7 +371,6 @@ void *EcaCwdi(void *argument)
 
 void *EcaCwfi(void *argument)
 {
-  static const char *func = "EcaCwfi";
   char *longname;
   int argN = 6;
   ECA_REQUEST_2 request;
@@ -471,7 +469,6 @@ void *EcaFd(void *argument)
 */
 void *EcaGsl(void *argument)
 {
-  static const char *func = "EcaGsl";
   char *longname;
   int argN = 6; 
   double argT = 5.0;
@@ -550,7 +547,6 @@ void *EcaHd(void *argument)
 
 void *EcaHwdi(void *argument)
 {
-  static const char *func = "EcaHwdi";
   char *longname;
   int argN = 6;
   double argT = 5.0;
@@ -594,7 +590,6 @@ void *EcaHwdi(void *argument)
 
 void *EcaHwfi(void *argument)
 {
-  static const char *func = "EcaHwfi";
   char *longname;
   int argN = 6;
   ECA_REQUEST_2 request;
@@ -662,7 +657,6 @@ void *EcaId(void *argument)
 
 void *EcaSu(void *argument)
 {
-  static const char *func = "EcaSu";
   char *longname;
   double argT = 25.0;
   ECA_REQUEST_1 request;
@@ -798,7 +792,6 @@ void *EcaTn90p(void *argument)
 
 void *EcaTr(void *argument)
 {
-  static const char *func = "EcaTr";
   char *longname;
   double argT = 20.0;
   ECA_REQUEST_1 request;
@@ -1286,7 +1279,6 @@ void *EcaRx1day(void *argument)
 
 void *EcaRx5day(void *argument)
 {
-  static const char *func = "EcaRx5day";
   char *longname;
   double argX = 50.0;
   ECA_REQUEST_1 request;
@@ -1381,7 +1373,6 @@ void *Fdns(void *argument)
 
 void *Strwin(void *argument)
 {
-  static const char *func = "Strwin";
   char *longname;
   double maxWind = 10.5;
   ECA_REQUEST_1 request;

src/Echam5ini.c

@@ -63,20 +63,18 @@ typedef struct {
   char   *atxtentry[1024];
 } ATTS;
 
-
-static void iniatts(ATTS *atts)
+static
+void iniatts(ATTS *atts)
 {
   atts->naint = 0;
   atts->naflt = 0;
   atts->natxt = 0;
 }
 
-
-static void inivar(VAR *var, int gridtype, int zaxistype, int code, const char *name,
+static
+void inivar(VAR *var, int gridtype, int zaxistype, int code, const char *name,
 	       const char *longname, const char *units)
-{
-  static const char *func = "inivar_ml";
-  
+{  
   var->gridtype  = gridtype;
   var->zaxistype = zaxistype;
   var->code      = code;
@@ -88,11 +86,9 @@ static void inivar(VAR *var, int gridtype, int zaxistype, int code, const char *
   if ( units )    var->units     = strdup(units);
 }
 
-
-static void inivars_ml(VAR **vars)
+static
+void inivars_ml(VAR **vars)
 {
-  static const char *func = "inivars_ml";
-
   *vars = (VAR *) malloc((nvars_ml+1)*sizeof(VAR));
 
   inivar(&(*vars)[0], GRID_GAUSSIAN, ZAXIS_HYBRID,  133, "Q",   "specific humidity", "kg/kg");
@@ -103,9 +99,9 @@ static void inivars_ml(VAR **vars)
   inivar(&(*vars)[4], GRID_SPECTRAL, ZAXIS_SURFACE, 152, "LSP", "log surface pressure", "");
 }
 
-
 #if  defined  (HAVE_LIBNETCDF)
-static void nce(int istat)
+static
+void nce(int istat)
 {
   /*
     This routine provides a simple interface to netCDF error message routine.
@@ -115,10 +111,9 @@ static void nce(int istat)
 }
 #endif
 
-
-static int import_e5ml(const char *filename, VAR **vars)
+static
+int import_e5ml(const char *filename, VAR **vars)
 {
-  static const char *func = "import_e5ml";
   int nvars = 0;
 #if  defined  (HAVE_LIBNETCDF)
   int nc_dim_id, nc_var_id;
@@ -277,10 +272,9 @@ static int import_e5ml(const char *filename, VAR **vars)
   return (nvars);
 }
 
-
-static void export_e5ml(const char *filename, VAR *vars, int nvars, int vdate, int vtime, int ntr)
+static
+void export_e5ml(const char *filename, VAR *vars, int nvars, int vdate, int vtime, int ntr)
 {
-  static const char *func = "export_e5ml";
 #if  defined  (HAVE_LIBNETCDF)
   int nc_var_id;
   size_t nvals;
@@ -612,11 +606,10 @@ static void export_e5ml(const char *filename, VAR *vars, int nvars, int vdate, i
 #endif
 }
 
-
 #if  defined  (HAVE_LIBNETCDF)
-static void read_gg3d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxisID)
+static
+void read_gg3d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxisID)
 {
-  static const char *func = "read_gg3d";
   int nlev, nlat, nlon, gridsize, i;
   int gridtype, zaxistype;
   int nc_var_id;
@@ -652,7 +645,8 @@ static void read_gg3d(int nc_file_id, const char *name, VAR *var, int gridID, in
 #endif
 
 #if  defined  (HAVE_LIBNETCDF)
-static void read_fc4d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxisID, int nhgl, int nmp1)
+static
+void read_fc4d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxisID, int nhgl, int nmp1)
 {
   static const char *func = "read_fc4d";
   int nlev, nfc, i;
@@ -688,10 +682,9 @@ static void read_fc4d(int nc_file_id, const char *name, VAR *var, int gridID, in
 }
 #endif
 
-
-static int import_e5res(const char *filename, VAR **vars, ATTS *atts)
+static
+int import_e5res(const char *filename, VAR **vars, ATTS *atts)
 {
-  static const char *func = "import_e5res";
   int nvars = 0;
 #if  defined  (HAVE_LIBNETCDF)
   int nc_var_id;
@@ -1083,10 +1076,9 @@ static int import_e5res(const char *filename, VAR **vars, ATTS *atts)
   return (nvars);
 }
 
-
-static void export_e5res(const char *filename, VAR *vars, int nvars)
+static
+void export_e5res(const char *filename, VAR *vars, int nvars)
 {
-  static const char *func = "export_e5res";
 #if  defined  (HAVE_LIBNETCDF)
   int nc_var_id;
   int varid;
@@ -1430,7 +1422,6 @@ static void export_e5res(const char *filename, VAR *vars, int nvars)
 
 void *Echam5ini(void *argument)
 {
-  static const char *func = "Echam5ini";
   int operatorID;
   int operfunc;
   int IMPORT_E5ML, IMPORT_E5RES;

src/Enlarge.c

@@ -30,7 +30,6 @@
 
 void *Enlarge(void *argument)
 {
-  static const char *func = "Enlarge";
   int streamID1, streamID2;
   int vlistID1, vlistID2;
   int gridID1, gridID2;

src/Enlargegrid.c

@@ -27,9 +27,9 @@
 #include "pstream.h"
 
 
-static void gen_index(int gridID1, int gridID2, int *index)
+static
+void gen_index(int gridID1, int gridID2, int *index)
 {
-  static const char *func = "gen_index";
   int nlat1, nlon1;
   int nlat2, nlon2;
   int gridtype1, gridtype2;
@@ -150,7 +150,6 @@ static void gen_index(int gridID1, int gridID2, int *index)
 
 void *Enlargegrid(void *argument)
 {
-  static const char *func = "Enlargegrid";
   int varID;
   int nrecs = 0;
   int tsID, recID, levelID;

src/Ensstat.c

@@ -44,7 +44,6 @@
 
 void *Ensstat(void *argument)
 {
-  static const char *func = "Ensstat";
   int operatorID;
   int operfunc;
   int i;

src/Ensstat2.c

@@ -33,7 +33,6 @@
 
 void *Ensstat2(void *argument)
 {
-  static const char *func = "Ensstat2";
   int operatorID;
   int operfunc;
   int i;

src/Eofcoeff.c

@@ -33,7 +33,6 @@ void    vlistDefVarTime(int vlistID, int varID, int timeID);
 
 void *Eofcoeff(void * argument)
 {
-  static const char *func = "Eofcoeff";
   char eof_name[5], oname[1024], filesuffix[32];
   double *w;
   double missval1=-999, missval2;

src/Eofcoeff3d.c

@@ -33,7 +33,6 @@ void    vlistDefVarTime(int vlistID, int varID, int timeID);
 
 void *Eofcoeff3d(void * argument)
 {
-  static const char *func = "Eofcoeff3d";
   char eof_name[6], oname[1024], filesuffix[32];
   double *w;
   double missval1=-999, missval2;

src/Exprf.c

@@ -43,7 +43,6 @@ Constansts: M_PI, M_E
 
 void *Expr(void *argument)
 {
-  static const char *func = "Expr";
   int EXPR, EXPRF, AEXPR, AEXPRF;
   int operatorID;
   char *exprs = NULL;

src/Fillmiss.c

@@ -29,7 +29,6 @@
 
 void fillmiss(field_t *field1, field_t *field2, int nfill)
 {
-  static const char *func = "fillmiss";
   int gridID, nx, ny, i, j;
   int nmiss1, nmiss2 = 0;
   int kr, ku, kl, ko;
@@ -139,9 +138,9 @@ void fillmiss(field_t *field1, field_t *field2, int nfill)
   free(matrix1);
 }
 
+
 void *Fillmiss(void *argument)
 {
-  static const char *func = "Fillmiss";
   int streamID1, streamID2;
   int nrecs, ngrids;
   int index;

src/Filter.c

@@ -145,7 +145,6 @@ void filter(int nts, const int *fmasc, double *array1, double *array2)
 
 void *Filter(void *argument)
 {
-  static const char *func = "Filter";
   enum {BAND, HIGH, LOW};
   char *tunits[] = {"second", "minute", "hour", "day", "month", "year"};
   int iunits[] = {31536000, 525600, 8760, 365, 12, 1};

src/Fldrms.c

@@ -30,7 +30,6 @@
 
 void *Fldrms(void *argument)
 {
-  static const char *func = "Fldrms";
   int streamID1, streamID2, streamID3;
   int vlistID1, vlistID2, vlistID3;
   int gridID1, gridID2, gridID3, lastgrid = -1;

src/Fldstat.c

@@ -38,7 +38,6 @@
 
 void *Fldstat(void *argument)
 {
-  static const char *func = "Fldstat";
   int operatorID;
   int operfunc;
   int streamID1, streamID2;

src/Fldstat2.c

@@ -67,7 +67,6 @@ double corr(double * restrict in0, double * restrict in1,
 
 void *Fldstat2(void *argument)
 {
-  static const char *func = "Fldstat2";
   int operatorID;
   int operfunc;
   int streamID1, streamID2, streamID3;

src/Fourier.c

@@ -31,7 +31,6 @@
 
 void *Fourier(void *argument)
 {
-  const char func[] = "Fourier";
   int ompthID;
   int bit, sign;
   int gridsize;

src/Gather.c

@@ -84,7 +84,6 @@ int cmpxy_gt(const void *s1, const void *s2)
 static
 int genGrid(int nfiles, ens_file_t *ef, int **gridindex, int igrid)
 {
-  static char *func = "genGrid";
   int lsouthnorth = TRUE;
   int fileID;
   int gridID;
@@ -233,7 +232,6 @@ int genGrid(int nfiles, ens_file_t *ef, int **gridindex, int igrid)
 
 void *Gather(void *argument)
 {
-  static const char *func = "Gather";
   int i;
   int nvars;
   int cmpfunc;

src/Gengrid.c

@@ -30,7 +30,6 @@
 
 void *Gengrid(void *argument)
 {
-  static const char *func = "Gengrid";
   int streamID1, streamID2, streamID3;
   int vlistID1, vlistID2, vlistID3;
   int gridID1, gridID2, gridID3;

src/Gradsdes.c

@@ -79,7 +79,8 @@ struct gaindx {
 
 /* Byte swap requested number of 4 byte elements */
 
-static void gabswp (void *r, int cnt) {
+static
+void gabswp (void *r, int cnt) {
 int i;
 char *ch1,*ch2,*ch3,*ch4,cc1,cc2;
 
@@ -105,7 +106,8 @@ char *ch1,*ch2,*ch3,*ch4,cc1,cc2;
  *                      Wesley Ebisuzaki
  */
 
-static float ibm2flt(unsigned char *ibm) {
+static
+float ibm2flt(unsigned char *ibm) {
 
 	int positive, power;
 	unsigned int abspower;
@@ -142,8 +144,8 @@ static float ibm2flt(unsigned char *ibm) {
  *
  * doesn't handle subnormal numbers
  */
-
-static int flt2ibm(float x, unsigned char *ibm) {
+static
+int flt2ibm(float x, unsigned char *ibm) {
 
 	int sign, exp, i;
 	double mant;
@@ -218,9 +220,9 @@ static int flt2ibm(float x, unsigned char *ibm) {
 
 #define  PutInt(buf, cnt, ival)   (ival < 0 ? Put4Byte(buf, cnt, 0x7fffffff - ival + 1) : Put4Byte(buf, cnt, ival))
 
-static void dumpmap()
+static
+void dumpmap()
 {
-  static const char *func = "dumpmap";
   unsigned char urec[4];
   unsigned char vermap;
   unsigned char mrec[512];
@@ -366,7 +368,6 @@ static void dumpmap()
 
 void *Gradsdes(void *argument)
 {
-  static const char *func = "Gradsdes";
   int GRADSDES1, GRADSDES2, DUMPMAP;
   int operatorID;
   int streamID = 0;

src/Gridboxstat.c

@@ -41,7 +41,6 @@
 static
 int genBoxGrid(int gridID1, int xinc, int yinc)
 {
-  static const char *func = "genBoxGrid";
   int i, j, i1;
   int gridID2 = -1, gridtype;
   int gridsize1 = 0, nlon1 = 0, nlat1 = 0;
@@ -503,7 +502,6 @@ int genBoxGrid(int gridID1, int xinc, int yinc)
 static
 void gridboxstat(field_t *field1, field_t *field2, int xinc, int yinc, int statfunc)
 {
-  static const char *func = "gridboxstat";
   int nlon1, nlat1;
   int nlon2, nlat2;
   int ilat, ilon;
@@ -599,7 +597,6 @@ void gridboxstat(field_t *field1, field_t *field2, int xinc, int yinc, int statf
 
 void *Gridboxstat(void *argument)
 {
-  static const char *func = "Gridboxstat";
   int operatorID;
   int operfunc;
   int streamID1, streamID2;

src/Gridcell.c

@@ -40,7 +40,6 @@ double orthodrome(double px1, double py1, double px2, double py2)
 
 void *Gridcell(void *argument)
 {
-  static const char *func = "Gridcell";
   int GRIDAREA, GRIDWGTS, GRIDMASK, GRIDDX, GRIDDY;
   int operatorID;
   int streamID1, streamID2;