settaxis: added support for negativ time increment

ChangeLog

+2014-01-07  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* settaxis: added support for negativ time increment
+
 2014-01-03  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* Added test/test_Select.sh

src/Ensstat3.c

@@ -57,7 +57,7 @@ void *Ensstat3(void *argument)
   int operatorID;
   int operfunc, datafunc;
   int i,j;
-  int nvars,nbins, nrecs = 0, nrecs0, nmiss, nens, nfiles;;
+  int nvars,nbins, nrecs = 0, nrecs0, nmiss, nens, nfiles;
   int cum;
   int chksum;                  // for check of histogram population 
   int levelID, varID, recID, tsID, binID = 0;

src/Inttime.c

@@ -92,7 +92,8 @@ void *Inttime(void *argument)
   if ( operatorArgc() == 3 )
     {
       const char *timeunits = operatorArgv()[2];
-      incperiod = (int)strtol(timeunits, NULL, 10);;
+      incperiod = (int)strtol(timeunits, NULL, 10);
+      if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
       while ( isdigit((int) *timeunits) ) timeunits++;
 
       get_tunits(timeunits, &incperiod, &incunit, &tunit);

src/Settime.c

@@ -182,7 +182,8 @@ void *Settime(void *argument)
       if ( operatorArgc() == 3 )
 	{
 	  const char *timeunits = operatorArgv()[2];
-	  incperiod = (int)strtol(timeunits, NULL, 10);;
+	  incperiod = (int)strtol(timeunits, NULL, 10);
+	  if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
 	  while ( isdigit((int) *timeunits) ) timeunits++;
 
 	  get_tunits(timeunits, &incperiod, &incunit, &tunit);
@@ -224,7 +225,7 @@ void *Settime(void *argument)
   else if ( operatorID == SHIFTTIME )
     {
       const char *timeunits = operatorArgv()[0];
-      incperiod = (int)strtol(timeunits, NULL, 10);;
+      incperiod = (int)strtol(timeunits, NULL, 10);
       if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
       while ( isdigit((int) *timeunits) ) timeunits++;
 

src/util.c

@@ -331,7 +331,7 @@ int ps_cval  = -1;
 void progressInit(void)
 {
   ps_lhead = FALSE;
-  ps_nch   = 0;;
+  ps_nch   = 0;
   ps_cval  = -1;
 }