Removed tabs from files.

Added @version lines to various header files.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1170 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 188 insertions, 188 deletions

diff --git a/src/util/ParseFile.c b/src/util/ParseFile.c
index 604f6380..089a874a 100644
--- a/src/util/ParseFile.c
+++ b/src/util/ParseFile.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-static char *rcsid = "$Id$";
+static char *rcsid = "$Header$";
 
 /* Local definitions and functions */
 #ifndef WIN32
@@ -40,9 +40,9 @@ static void removeSpaces(char *stripMe);
   syntax we allow is
   <ul>
     <li>a = b
-	<li>a,b,c = d,e,f
-	<li># rest of the line is ignored
-	<li>x = "string value"
+        <li>a,b,c = d,e,f
+        <li># rest of the line is ignored
+        <li>x = "string value"
   </ul>
   So it is easy to parse
   <p>
@@ -55,13 +55,13 @@ static void removeSpaces(char *stripMe);
   @hdate Tue Jan 12 16:41:36 1999 @hauthor Tom Goodale
   @hdesc Moved to CCTK.
          Changed to pass data to arbitrary function.
-	 Changed to take a file descriptor rather than a filename.
+         Changed to take a file descriptor rather than a filename.
   @endhistory
   @@*/
 
 
 int ParseFile(FILE *ifp, 
-	      int (*set_function)(const char *, const char *)) 
+              int (*set_function)(const char *, const char *)) 
 {
   /* Buffers for parsing from the file */
   char tokens[BUF_SZ], value[BUF_SZ];
@@ -93,8 +93,8 @@ int ParseFile(FILE *ifp,
     {
       if(intoken)
       {
-	fprintf(stderr, "Parse error at line %d.  No value supplied.\n", lineno);
-	intoken = 0;
+        fprintf(stderr, "Parse error at line %d.  No value supplied.\n", lineno);
+        intoken = 0;
       }
 
       lineno ++;
@@ -111,7 +111,7 @@ int ParseFile(FILE *ifp,
       CheckBuf(intoken,lineno);
     }
 
-		
+                
     /* Start of a new token */
     if (c != ' ' && c != '\n' && !inval && !intoken) 
     {
@@ -124,189 +124,189 @@ int ParseFile(FILE *ifp,
     {
       if (intoken) 
       {
-	unsigned int ll;
-	tokens[intoken] = '\0';  /* Very important! */
-	intoken = 0;
-	inval = 0;
-	removeSpaces(tokens);
-	ntokens = 1;
-	for (ll=0;ll < strlen(tokens); ll++)
-	  if (tokens[ll] == ',') ntokens++;
+        unsigned int ll;
+        tokens[intoken] = '\0';  /* Very important! */
+        intoken = 0;
+        inval = 0;
+        removeSpaces(tokens);
+        ntokens = 1;
+        for (ll=0;ll < strlen(tokens); ll++)
+          if (tokens[ll] == ',') ntokens++;
 #ifdef DEBUG
-	printf ("New token! >>%s<<\n",tokens);
-	printf ("%d token elements\n",ntokens);
+        printf ("New token! >>%s<<\n",tokens);
+        printf ("%d token elements\n",ntokens);
 #endif
 
-	/* Scan ahead to the beginning of the value
-	 * and check if the value is a string or
-	 * not. UNLIKE shalfs parser, this one DOES
-	 * strip quotes off of the strings. Bye bye
-	 * to StripQuotes routines...
-	 */
-	while ((c = fgetc(ifp)) == ' ' || c == '\n' || c == '\t');
-	if (c == '"') 
-	{
-	  /* Just handle the damn thing. */
-	  int p = 0;
-	  if (ntokens > 1) 
-	  {
-	    fprintf (stderr, "%s%s%s\n",
-		     "WARNING: Multiple string ",
-		     "tokens not supported for ",
-		     tokens);
-	    fprintf(stderr, "This is a fatal error");
-	    return 1;
-	  }
-	  while ((c = fgetc(ifp)) != '"') 
-	  {
-	    /* Make an important decision NOT to include 
-	     * line feeds in the string parameters
-	     */
-	    if (c != '\n') value[p++] = c;
-	    if (c == '\n') 
-	    {
-	      printf ("%sWarning:%s Quoted string contains newline for token %s\n",
-		      BOLDON, BOLDOFF, tokens);
-	      printf ("This could indicated a parameter file error or missing quote\n");
-	    }
-	    CheckBuf(p,lineno);
-	  }
-	  value[p] = '\0';
+        /* Scan ahead to the beginning of the value
+         * and check if the value is a string or
+         * not. UNLIKE shalfs parser, this one DOES
+         * strip quotes off of the strings. Bye bye
+         * to StripQuotes routines...
+         */
+        while ((c = fgetc(ifp)) == ' ' || c == '\n' || c == '\t');
+        if (c == '"') 
+        {
+          /* Just handle the damn thing. */
+          int p = 0;
+          if (ntokens > 1) 
+          {
+            fprintf (stderr, "%s%s%s\n",
+                     "WARNING: Multiple string ",
+                     "tokens not supported for ",
+                     tokens);
+            fprintf(stderr, "This is a fatal error");
+            return 1;
+          }
+          while ((c = fgetc(ifp)) != '"') 
+          {
+            /* Make an important decision NOT to include 
+             * line feeds in the string parameters
+             */
+            if (c != '\n') value[p++] = c;
+            if (c == '\n') 
+            {
+              printf ("%sWarning:%s Quoted string contains newline for token %s\n",
+                      BOLDON, BOLDOFF, tokens);
+              printf ("This could indicated a parameter file error or missing quote\n");
+            }
+            CheckBuf(p,lineno);
+          }
+          value[p] = '\0';
 #ifdef DEBUG
-	  printf ("String %s -> %s\n",
-		  tokens,value);
+          printf ("String %s -> %s\n",
+                  tokens,value);
 #endif
-	  set_function(tokens,value);
-	  
-	  
-	} 
-	else 
-	{
-	  int p = 0;
-	  value[p++] = c;
-	  if (ntokens == 1) 
-	  {
-	    /* Simple case. We have an int
-	       or a double which contain no
-	       spaces! */
-	    c = fgetc(ifp);
-	    while (!(c==' ' || c=='\t' || c == '\n' || c == EOF)) 
-	    {
-	      value[p++] = c;
-	      CheckBuf(p,lineno);
-	      c = fgetc(ifp);
-	    }
-	    value[p] = '\0';
+          set_function(tokens,value);
+          
+          
+        } 
+        else 
+        {
+          int p = 0;
+          value[p++] = c;
+          if (ntokens == 1) 
+          {
+            /* Simple case. We have an int
+               or a double which contain no
+               spaces! */
+            c = fgetc(ifp);
+            while (!(c==' ' || c=='\t' || c == '\n' || c == EOF)) 
+            {
+              value[p++] = c;
+              CheckBuf(p,lineno);
+              c = fgetc(ifp);
+            }
+            value[p] = '\0';
 #ifdef DEBUG
-	    printf ("Parsed %d characters\n", p);
-	    printf("Float/Int: %s -> %s\n", tokens,value);
+            printf ("Parsed %d characters\n", p);
+            printf("Float/Int: %s -> %s\n", tokens,value);
 #endif
-	    set_function(tokens,value);
-
-	  } 
-	  else 
-	  {
-	    /* Harder case of multiple tokens */
-	    int ncommas = 0;
-	    int p=0, i;
-	    char subtoken[BUF_SZ], subvalue[BUF_SZ];
-	    int pt, pv;
-
-	    value[p++] = c;
-	    /* OK, since we only have numbers in the
-	       old input stream, we can go along getting
-	       ntokens-1 commas, stripping spaces, and
-	       make a nice little string. 
-	       */
-	    c = fgetc(ifp);
-	    while (ncommas < ntokens-1 && c != EOF) 
-	    {
-	      if (!(c == ' ' || c == '\t' || c == '\n')) 
-	      {
-		value[p++] = c;
-		CheckBuf(p,lineno);
-	      }
-	      if (c == ',') ncommas ++;
-	      c = fgetc(ifp);
-	    }
-	    if (c == ' ' || c == '\t')
-	    {
-	      /* Great now strip out the spaces */
-	      while((c = fgetc(ifp)) == ' ' || c=='\t' || c == '\n');
-	    }
-	    
-	    /* And tack the rest on */
-	    value[p++] = c;
-	    CheckBuf(p,lineno);
-
-	    c = fgetc(ifp);
-	    while (c != ' ' && c != '\t' && c != '\n' && c != EOF) 
-	    {
-	      value[p++] = c;
-	      CheckBuf(p,lineno);
-	      c = fgetc(ifp);
-	    }
-	    value[p] = '\0';
+            set_function(tokens,value);
+
+          } 
+          else 
+          {
+            /* Harder case of multiple tokens */
+            int ncommas = 0;
+            int p=0, i;
+            char subtoken[BUF_SZ], subvalue[BUF_SZ];
+            int pt, pv;
+
+            value[p++] = c;
+            /* OK, since we only have numbers in the
+               old input stream, we can go along getting
+               ntokens-1 commas, stripping spaces, and
+               make a nice little string. 
+               */
+            c = fgetc(ifp);
+            while (ncommas < ntokens-1 && c != EOF) 
+            {
+              if (!(c == ' ' || c == '\t' || c == '\n')) 
+              {
+                value[p++] = c;
+                CheckBuf(p,lineno);
+              }
+              if (c == ',') ncommas ++;
+              c = fgetc(ifp);
+            }
+            if (c == ' ' || c == '\t')
+            {
+              /* Great now strip out the spaces */
+              while((c = fgetc(ifp)) == ' ' || c=='\t' || c == '\n');
+            }
+            
+            /* And tack the rest on */
+            value[p++] = c;
+            CheckBuf(p,lineno);
+
+            c = fgetc(ifp);
+            while (c != ' ' && c != '\t' && c != '\n' && c != EOF) 
+            {
+              value[p++] = c;
+              CheckBuf(p,lineno);
+              c = fgetc(ifp);
+            }
+            value[p] = '\0';
 #ifdef DEBUG
-	    printf("Comma list: %s -> %s\n",
-		   tokens,value);
+            printf("Comma list: %s -> %s\n",
+                   tokens,value);
 #endif
-	    /* So parse out the tokens */
-	    pt = 0;
-	    pv = 0;
-	    for (i=0;i<ncommas;i++) 
-	    {
-	      p = 0;
-	      while (tokens[pt] != ',') 
-	      {
-		subtoken[p++] = tokens[pt++];
-		CheckBuf(p,lineno);
-	      }
-	      subtoken[p] = '\0';
-	      p = 0;
-	      while (value[pv] != ',') 
-	      {
-		subvalue[p++] = value[pv++];
-		CheckBuf(p,lineno);
-	      }
-	      subvalue[p] = '\0';
-
-	      set_function(subtoken,subvalue);
+            /* So parse out the tokens */
+            pt = 0;
+            pv = 0;
+            for (i=0;i<ncommas;i++) 
+            {
+              p = 0;
+              while (tokens[pt] != ',') 
+              {
+                subtoken[p++] = tokens[pt++];
+                CheckBuf(p,lineno);
+              }
+              subtoken[p] = '\0';
+              p = 0;
+              while (value[pv] != ',') 
+              {
+                subvalue[p++] = value[pv++];
+                CheckBuf(p,lineno);
+              }
+              subvalue[p] = '\0';
+
+              set_function(subtoken,subvalue);
 #ifdef DEBUG
-	      printf("Setting sub-token %s -> %s\n",
-		     subtoken, subvalue);
+              printf("Setting sub-token %s -> %s\n",
+                     subtoken, subvalue);
 #endif
-	      /* Now remeber we are sitting on a comma
-	       * in both our input strings, so bump by one
-	       */
-	      pv ++; pt ++;
-	    }
-	    /* And OK, so now we have one parameter left
-	     * so lets handle that 
-	     */ 
-	    p = 0;
-	    while (tokens[pt] != '\0') 
-	    {
-	      subtoken[p++] = tokens[pt++];
-	      CheckBuf(p,lineno);
-	    }
-	    subtoken[p] = '\0';
-	    p = 0;
-	    while (value[pv] != '\0') 
-	    {
-	      subvalue[p++] = value[pv++];
-	      CheckBuf(p,lineno);
-	    }
-	    subvalue[p] = '\0';
-
-	    set_function(subtoken,subvalue);
-	  }
-	}
+              /* Now remeber we are sitting on a comma
+               * in both our input strings, so bump by one
+               */
+              pv ++; pt ++;
+            }
+            /* And OK, so now we have one parameter left
+             * so lets handle that 
+             */ 
+            p = 0;
+            while (tokens[pt] != '\0') 
+            {
+              subtoken[p++] = tokens[pt++];
+              CheckBuf(p,lineno);
+            }
+            subtoken[p] = '\0';
+            p = 0;
+            while (value[pv] != '\0') 
+            {
+              subvalue[p++] = value[pv++];
+              CheckBuf(p,lineno);
+            }
+            subvalue[p] = '\0';
+
+            set_function(subtoken,subvalue);
+          }
+        }
       } 
       else 
       {
-	fprintf (stderr, "Parser failed at = on line %d\n",
-		 lineno);
+        fprintf (stderr, "Parser failed at = on line %d\n",
+                 lineno);
       }
     }
   }
@@ -327,7 +327,7 @@ static void CheckBuf(int p, int l)
 {
   if (p >= BUF_SZ) {
     fprintf(stderr,"WARNING: Parser buffer overflow on line %d\n",
-	    l);
+            l);
     fprintf(stderr,"This indicates either an incorrect parm file or\n");
     fprintf(stderr,"the need to recompile doParse.C with a bigger\n");
     fprintf(stderr,"BUF_SZ parm.\n");
@@ -356,15 +356,15 @@ static void CheckBuf(int p, int l)
 
 static void removeSpaces(char *stripMe) 
 {
-	char *s;
-	unsigned int i,j;
-	s = (char *)malloc((strlen(stripMe)+2)*sizeof(char));
-	strcpy(s,stripMe);
-	for (i=0,j=0;i<strlen(s);i++)
-		if (s[i] != ' ' && s[i] != '\t' && s[i] != '\n')
-			stripMe[j++] = s[i];
-	stripMe[j] = '\0';
-	free(s);
+        char *s;
+        unsigned int i,j;
+        s = (char *)malloc((strlen(stripMe)+2)*sizeof(char));
+        strcpy(s,stripMe);
+        for (i=0,j=0;i<strlen(s);i++)
+                if (s[i] != ' ' && s[i] != '\t' && s[i] != '\n')
+                        stripMe[j++] = s[i];
+        stripMe[j] = '\0';
+        free(s);
 }