bugfix

.gitmodules

+[submodule "nanocernlib"]
+	path = nanocernlib
+	url = https://github.com/sly2j/nanocernlib.git

CTP/thUtils.c

@@ -46,7 +46,8 @@
  *	  Fix up potential ref to unallocated memory in thIDToken.
  *
  *	  Revision 1.4  1994/09/27  19:44:50  saw
- *	  Add fnmatch routine from BSD.  Only use when OS doesn't have it (ultrix)
+ *	  Add fnmatch routine from BSD.  Only use when OS doesn't have it
+ *(ultrix)
  *
  *	  Revision 1.3  1994/07/21  20:40:22  saw
  *	  In thCommas, ignore commas in quotes.  Replace stderr with STDERR.
@@ -63,13 +64,13 @@
    Routines used by thTest, thHist and thParm
 
 */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "thUtils.h"
 #include "daVar.h"
 #include "th.h"
 #include "thInternal.h"
-#include "thUtils.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 daVarStatus thGetIndex(char* name, int* index, char** pptr)
 /* If the name has an array index, evaluate the index and return it to
@@ -87,12 +88,14 @@ cleaned up.
   int istyle;
 
   pbegin = nend = name + strlen(name);
-  if((t=strchr(name,'('))) if(t<pbegin) {
+  if ((t = strchr(name, '(')))
+    if (t < pbegin) {
       pbegin = t;
       cright = ')';
       istyle = -1;
     }
-  if((t=strchr(name,'['))) if(t<pbegin) {
+  if ((t = strchr(name, '[')))
+    if (t < pbegin) {
       pbegin = t;
       cright = ']';
       istyle = 0;
@@ -132,12 +135,15 @@ int thComSpace(char *s,char **args)
   comma = 1;
   while (*p != '\0') {
     while (isspace(*p) || (!comma && *p == ',')) {
-      if(!comma) comma = (*p == ',');
+      if (!comma)
+        comma = (*p == ',');
       p++;
     }
-    if(*p == '\0') break;
+    if (*p == '\0')
+      break;
     args[i++] = p;
-    while(!isspace(*p) && *p != ',' && *p != '\0') p++;
+    while (!isspace(*p) && *p != ',' && *p != '\0')
+      p++;
     if (*p != '\0') {
       comma = (*p == ',');
       *p++ = '\0';
@@ -158,8 +164,10 @@ int thCommas(char *s,char **args){
   instring = 0;
   while (*p != 0) {
     if (instring && *p == quotechar) {
-      if(*(p+1) == quotechar) p++;
-      else instring = 0;
+      if (*(p + 1) == quotechar)
+        p++;
+      else
+        instring = 0;
     } else {
       if (*p == ',') {
         *p = '\0';
@@ -198,20 +206,25 @@ to signify an error.
 
   if ((leftp = strchr(s, '('))) {
     cright = ')';
-    wleft = '['; wright = ']';
+    wleft = '[';
+    wright = ']';
     cstyle = 1;
   } else if ((leftp = strchr(s, '['))) {
     cright = ']';
-    wleft = '('; wright = ')';
+    wleft = '(';
+    wright = ')';
     cstyle = 0;
-  } else return(NULL);
+  } else
+    return (NULL);
   rightp = strchr(s, cright);
-  if((leftp>=rightp) || strchr(s,wleft) || strchr(s,wright)) return (NULL);
+  if ((leftp >= rightp) || strchr(s, wleft) || strchr(s, wright))
+    return (NULL);
   len = min(24, (rightp - leftp) - 1);
   strncpy(sindex, leftp + 1, len);
   sindex[len] = 0;
   *index = atol(sindex);
-  if(cstyle) (*index)--;
+  if (cstyle)
+    (*index)--;
   return (leftp);
 }
 
@@ -229,10 +242,11 @@ Allows hex constants as INT's */
   p = s;
   typ = TOKINT;
   while (*p != '\0') {
-    if(strchr("()[]",*p)) {/*  printf("%d\n",TOKARRAY); */ return(TOKARRAY);}
+    if (strchr("()[]", *p)) { /*  printf("%d\n",TOKARRAY); */
+      return (TOKARRAY);
+    }
     if (typ != TOKVAR) {
-      switch(*p)
-	{
+      switch (*p) {
       case 'e':
       case 'E':
         if (nume > 0 || p == s) {
@@ -246,13 +260,15 @@ Allows hex constants as INT's */
       case '+':
       case '-':
         break;
-	case 'x': case 'X':
+      case 'x':
+      case 'X':
         if (p == s || *(p - 1) != '0' || nume > 0)
           typ = TOKVAR;
         else
           nume = 1;
       default:
-	  if(!isdigit(*p)) typ = TOKVAR;
+        if (!isdigit(*p))
+          typ = TOKVAR;
         break;
       }
     }
@@ -270,16 +286,16 @@ char *thSpaceStrip(char *s)
 
   p = t = s;
   while (*s != '\0') {
-    if(*s != ' ') *t++ = *s++;
-    else *s++;
+    if (*s != ' ')
+      *t++ = *s++;
+    else
+      *s++;
   }
   *t = '\0';
   return (p);
-
 }
 
-int thSpecial(char *line, char *default_class)
-{				/* Process special commands */
+int thSpecial(char* line, char* default_class) { /* Process special commands */
   char *s, *p;
   char* command;
   char* arg;
@@ -292,21 +308,29 @@ int thSpecial(char *line, char *default_class)
   int i;
 
   s = line;
-  while(isspace(*s) && *s) s++;
-  if(*s != SPECIALCHAR) return(0); /* Not a special command */
+  while (isspace(*s) && *s)
+    s++;
+  if (*s != SPECIALCHAR)
+    return (0); /* Not a special command */
 
   /* Split line into command and argument */
   s++;
-  while(isspace(*s) && *s) s++;	/* Skip to command */
-  if(!*s) return(1);		/* Empty line */
+  while (isspace(*s) && *s)
+    s++; /* Skip to command */
+  if (!*s)
+    return (1); /* Empty line */
   /* s now points to the command */
   p = s + 1;
-  while(!isspace(*p) && *p) p++; /* Skip to end of command */
-  if(!*p) return(1);		/* No argument */
+  while (!isspace(*p) && *p)
+    p++; /* Skip to end of command */
+  if (!*p)
+    return (1); /* No argument */
   command = malloc(p - s + 1);
-  strncpy(command,s,p-s); command[p-s] = '\0';
+  strncpy(command, s, p - s);
+  command[p - s] = '\0';
   s = p;
-  while(isspace(*s) && *s) s++;	/* Skip to argument */
+  while (isspace(*s) && *s)
+    s++;     /* Skip to argument */
   if (!*s) { /* No argument */
     free(command);
     return (1);
@@ -321,7 +345,10 @@ int thSpecial(char *line, char *default_class)
     *s = 0;
     class = s + 1;
     s = class;
-    while(*s) {tolower(*s); s++;}
+    while (*s) {
+      tolower(*s);
+      s++;
+    }
   } else {
     class = default_class;
   } /* Should probably use a table here */
@@ -361,7 +388,8 @@ thVarCreate(char *s, int vartype, char **classlist, daVarStruct **varpp)
     char* lb;
     lb = strchr(s, '[');
     if (leftp) {
-      if(lb && lb<leftp) leftp = lb;
+      if (lb && lb < leftp)
+        leftp = lb;
     } else
       leftp = lb;
   }
@@ -406,17 +434,16 @@ thVarCreate(char *s, int vartype, char **classlist, daVarStruct **varpp)
       var.name = malloc(strlen(s) + 1);
       strcpy(var.name, s);
     } else {
-      var.name = malloc(strlen(classlist[0])
-				 +strlen(s)+2);
+      var.name = malloc(strlen(classlist[0]) + strlen(s) + 2);
       strcpy(var.name, classlist[0]);
       strcat(var.name, ".");
       strcat(var.name, s);
     }
-    if(leftp) *leftp = cleft;	/* Restore left paren */
+    if (leftp)
+      *leftp = cleft; /* Restore left paren */
     var.size = arsize;
     var.type = vartype;
-    switch(vartype)
-      {
+    switch (vartype) {
     case DAVARINT: /* How should we initialize the variables */
       var.varptr = malloc(var.size * sizeof(DAINT));
       break;
@@ -442,7 +469,8 @@ thVarCreate(char *s, int vartype, char **classlist, daVarStruct **varpp)
     daVarLookupP(var.name, varpp);
     free(var.name);
   } else {
-    if(leftp) *leftp = cleft;	/* Restore left paren */
+    if (leftp)
+      *leftp = cleft; /* Restore left paren */
     /* Already exists */
     if ((*varpp)->type == vartype && (*varpp)->size == arsize) {
       /* We are OK, return */
@@ -453,18 +481,21 @@ thVarCreate(char *s, int vartype, char **classlist, daVarStruct **varpp)
         if ((*varpp)->size != arsize || (*varpp)->type != vartype) {
           (*varpp)->type = vartype;
           (*varpp)->size = arsize;
-	  switch((*varpp)->type)
-	    {
+          switch ((*varpp)->type) {
           case DAVARINT:
-	      (*varpp)->varptr = (void *) realloc((*varpp)->varptr,arsize * sizeof(DAINT));
+            (*varpp)->varptr =
+                (void*)realloc((*varpp)->varptr, arsize * sizeof(DAINT));
             break;
           case DAVARFLOAT:
-	      (*varpp)->varptr = (void *) realloc((*varpp)->varptr,arsize * sizeof(DAFLOAT));
+            (*varpp)->varptr =
+                (void*)realloc((*varpp)->varptr, arsize * sizeof(DAFLOAT));
             break;
           case DAVARDOUBLE:
-	      (*varpp)->varptr = (void *) realloc((*varpp)->varptr,arsize * sizeof(DADOUBLE));
+            (*varpp)->varptr =
+                (void*)realloc((*varpp)->varptr, arsize * sizeof(DADOUBLE));
           case DAVARSTRING:
-	      (*varpp)->varptr = (void *) realloc((*varpp)->varptr,arsize * sizeof(char *));
+            (*varpp)->varptr =
+                (void*)realloc((*varpp)->varptr, arsize * sizeof(char*));
             *((char*)var.varptr) = '\0';
             break;
           }
@@ -475,11 +506,8 @@ thVarCreate(char *s, int vartype, char **classlist, daVarStruct **varpp)
   return (S_SUCCESS);
 }
 
-
-
 #ifdef OLD
-int thGetMode(char *s, enum MODES mode, enum MODES *nmode, char **blocknamep)
-{
+int thGetMode(char* s, enum MODES mode, enum MODES* nmode, char** blocknamep) {
   char* args[20];
   int nargs;
   enum MODES omod e;
@@ -491,11 +519,13 @@ int thGetMode(char *s, enum MODES mode, enum MODES *nmode, char **blocknamep)
   *blocknamep = 0;
 
   command = s;
-  while(isspace(*command)) command++;
+  while (isspace(*command))
+    command++;
   last = command;
-  while(!isspace(*last) && *last) last++;
-  if(strncasecmp(command,"begin",last-command) == 0
-     || strncasecmp(command,"end",last-command) == 0){
+  while (!isspace(*last) && *last)
+    last++;
+  if (strncasecmp(command, "begin", last - command) == 0 ||
+      strncasecmp(command, "end", last - command) == 0) {
     nargs = thComSpace(s, args);
     if (nargs < 2) {
       *nmode = M_BAD;
@@ -503,8 +533,8 @@ int thGetMode(char *s, enum MODES mode, enum MODES *nmode, char **blocknamep)
     }
     if (strcasecmp("test", args[1]) == 0)
       *nmode = M_TES;
-    else if(strcasecmp("hist",args[1]) == 0
-	    || strcasecmp("histogram",args[1]) == 0)
+    else if (strcasecmp("hist", args[1]) == 0 ||
+             strcasecmp("histogram", args[1]) == 0)
       *nmode = M_HIS;
     else if (strcasecmp("parameter", args[1]) == 0)
       *nmode = M_PAR;
@@ -559,10 +589,8 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
       var.rhook = 0;
       var.whook = 0;
       var.opaque = 0;
-      switch(toktyp)
-	{
-	case TOKINT:
-	  {
+      switch (toktyp) {
+      case TOKINT: {
         register DAINT* longp;
         longp = malloc(sizeof(DAINT));
         *longp = atol(token);
@@ -571,10 +599,8 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
         var.size = 1;
         /*	    daVarRegister(token,longp,DAVARINT,1,DAVAR_READONLY);*/
         thVarRegister((int)0, &var);
-	  }
-	  break;
-	case TOKFLOAT:
-	  {
+      } break;
+      case TOKFLOAT: {
         register DAFLOAT* floatp;
         floatp = malloc(sizeof(DAFLOAT));
         *floatp = atof(token);
@@ -583,10 +609,8 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
         var.size = 1;
         /*	    daVarRegister(token,floatp,DAVARFLOAT,1,DAVAR_READONLY);*/
         thVarRegister((int)0, &var);
-	  }
-	  break;
-	case TOKVAR:
-	  {
+      } break;
+      case TOKVAR: {
         register DAINT* longp;
         longp = malloc(sizeof(DAINT));
         var.varptr = longp;
@@ -594,12 +618,12 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
         var.size = 1;
         /*	    daVarRegister(token,intp,DAVARINT,1,DAVAR_READWRITE);*/
         thVarRegister((int)0, &var);
-	  }
-	  break;
-	case TOKARRAY:
-	  {
+      } break;
+      case TOKARRAY: {
         /* Only create if underlying variable exists. */
-	    char *p; int index; char leftp;
+        char* p;
+        int index;
+        char leftp;
         p = thTokenArray(token, &index);
         leftp = *p; /* Save ( or [ character */
         *p = 0;
@@ -607,20 +631,18 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
         if (lookstat != S_SUCCESS)
           lookstat = thVarLookup(token, &var);
         if (lookstat == S_SUCCESS && intonly && (var.type != DAVARINT)) {
-	      fprintf(STDERR,
-		      "Array %s must be a preregistered LONGINT array.\n",token);
+          fprintf(STDERR, "Array %s must be a preregistered LONGINT array.\n",
+                  token);
           return (S_FAILURE);
         } else {
           if (index >= var.size) {
-		fprintf(STDERR,
-			"Index %d exceeds %s array length of %d\n",index,
+            fprintf(STDERR, "Index %d exceeds %s array length of %d\n", index,
                     token, var.size);
             return (S_FAILURE);
           }
         }
         *p = leftp;
-	    switch(var.type)
-	      {
+        switch (var.type) {
         case DAVARINT:
           var.varptr = (int*)(var.varptr) + index;
           var.type = DAVARINT;
@@ -633,8 +655,7 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
           break;
         default:
           *p = 0;
-		fprintf(STDERR,"Illegal type %d for variable %s\n"
-			,var.type,token);
+          fprintf(STDERR, "Illegal type %d for variable %s\n", var.type, token);
           return (S_FAILURE);
         }
         break;
@@ -655,12 +676,12 @@ int thTokToPtr(char *token, int create, int intonly, daVarStruct *varp)
   return (S_SUCCESS);
 }
 #endif
-int thCleanLine(char *s)
-{
+int thCleanLine(char* s) {
   int blank;
   blank = 1;
   while (*s != 0) {
-    if(isspace(*s)) *s = ' ';	/* Remove tabs, ... */
+    if (isspace(*s))
+      *s = ' '; /* Remove tabs, ... */
     else if (*s == COMCHAR) {
       *s = 0;
       break;
@@ -691,13 +712,11 @@ int thCleanLine(char *s)
     }
   return(d);
 }*/
-int argtoInt(daVarStruct *x)
-{
+int argtoInt(daVarStruct* x) {
   DAINT l;
   DAFLOAT d;
 
-  switch(x->type)
-    {
+  switch (x->type) {
   case DAVARINT:
     l = *(DAINT*)x->varptr;
     break;
@@ -716,7 +735,6 @@ int argtoInt(daVarStruct *x)
   return (l);
 }
 
-    
 /*
         strstr - public-domain implementation of standard C library function
 
@@ -746,14 +764,14 @@ int argtoInt(daVarStruct *x)
 #define ZAP
 #endif
 
-#include	<stddef.h>		/* defines size_t and NULL */
 #include <limits.h> /* defines UCHAR_MAX */
+#include <stddef.h> /* defines size_t and NULL */
 
 #ifdef ZAP
 typedef void* pointer;
 /* Not clear why we need to do this at all */
 #ifndef linux
-extern pointer	memset( pointer, int, size_t );
+// extern pointer	memset( pointer, int, size_t );
 #endif
 #endif
 
@@ -818,7 +836,8 @@ strcasestr(const char *s1, const char *s2 )
 
     c = UCHAR_MAX;
     do
-      if(!isupper(c)) shift[c] = m - shift[c];
+      if (!isupper(c))
+        shift[c] = m - shift[c];
     while (--c > 0);
 
     /* Note: shift[0] is still undefined at this point. */
@@ -830,10 +849,8 @@ strcasestr(const char *s1, const char *s2 )
 
   /* Try to find the pattern in the text string: */
 
-  for ( top = tx = (cuc *)s1; ; tx += shift[tolower(*(top = t))] )
-    {
-      for ( t = tx, p = (cuc *)s2; ; ++t, ++p )
-	{
+  for (top = tx = (cuc*)s1;; tx += shift[tolower(*(top = t))]) {
+    for (t = tx, p = (cuc*)s2;; ++t, ++p) {
       if (*p == EOS) /* entire pattern matched */
         return (char*)tx;
 
@@ -849,13 +866,11 @@ strcasestr(const char *s1, const char *s2 )
 
       if (*t == EOS)
         return NULL;         /* no match */
-      }
-      while ( ++t - tx != m );	/* < */
+    } while (++t - tx != m); /* < */
   }
 }
 
-void thAddVarToList(daVarStructList **head, daVarStruct *varp)
-{
+void thAddVarToList(daVarStructList** head, daVarStruct* varp) {
   daVarStructList* nextptr;
 
   if (head == 0) {
@@ -927,9 +942,7 @@ static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 /*static const char *rangematch __P((const char *, int, int));*/
 static const char* rangematch(const char*, int, int);
 
-int
-fnmatch(pattern, string, flags)
-	const char *pattern, *string;
+int fnmatch(pattern, string, flags) const char *pattern, *string;
 int flags;
 {
   const char* stringstart;
@@ -964,8 +977,7 @@ fnmatch(pattern, string, flags)
       /* Optimize for pattern with * at end or before /. */
       if (c == EOS)
         if (flags & FNM_PATHNAME)
-					return (strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
+          return (strchr(string, '/') == NULL ? 0 : FNM_NOMATCH);
         else
           return (0);
       else if (c == '/' && flags & FNM_PATHNAME) {
@@ -988,8 +1000,7 @@ fnmatch(pattern, string, flags)
         return (FNM_NOMATCH);
       if (*string == '/' && flags & FNM_PATHNAME)
         return (FNM_NOMATCH);
-			if ((pattern =
-			    rangematch(pattern, *string, flags)) == NULL)
+      if ((pattern = rangematch(pattern, *string, flags)) == NULL)
         return (FNM_NOMATCH);
       ++string;
       break;
@@ -1009,9 +1020,7 @@ fnmatch(pattern, string, flags)
   /* NOTREACHED */
 }
 
-static const char *
-rangematch(pattern, test, flags)
-	const char *pattern;
+static const char* rangematch(pattern, test, flags) const char* pattern;
 int test, flags;
 {
   int negate, ok;
@@ -1032,8 +1041,7 @@ rangematch(pattern, test, flags)
       c = *pattern++;
     if (c == EOS)
       return (NULL);
-		if (*pattern == '-' 
-		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
+    if (*pattern == '-' && (c2 = *(pattern + 1)) != EOS && c2 != ']') {
       pattern += 2;
       if (c2 == '\\' && !(flags & FNM_NOESCAPE))
         c2 = *pattern++;

nanocernlib @ 60d4533e

+Subproject commit 60d4533ecaff8a49e71981f7c419fdd910a9e767

trg_track.f

@@ -445,7 +445,7 @@ CGAW              B_field_z(iz,ir) = 0.0
 *
       SUBROUTINE trgDeriv(u,dudt,spect)
       IMPLICIT NONE
-      REAL*8 u(9),dudt(9)
+      REAL*8 u(6),dudt(9)
 * --  calculate the derivatives du(i)/dt for the runke kutta routine         
 *
 *     Parameter: