Index: trunk/Ohana/src/libfits/header/F_modify.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_modify.c	(revision 8556)
+++ trunk/Ohana/src/libfits/header/F_modify.c	(revision 10073)
@@ -117,5 +117,5 @@
   
   c += 2;
-  /* advance pointer over whitespace */
+  /* advance pointer over WHITESPACE */
   while ((*c == ' ') && (c < line + 80)) { c++; }
   
@@ -137,5 +137,5 @@
   c1 += 2;
 
-  /* advance pointer over whitespace */
+  /* advance pointer over WHITESPACE */
   while ((*c1 == ' ') && (c1 < line + 80)) { c1++; }
   
Index: trunk/Ohana/src/libfits/header/F_scan.c
===================================================================
--- trunk/Ohana/src/libfits/header/F_scan.c	(revision 8556)
+++ trunk/Ohana/src/libfits/header/F_scan.c	(revision 10073)
@@ -42,5 +42,5 @@
     Nchar = MIN (80, p + 80 - q);
     memcpy (tmp, q, Nchar);
-    gfits_stripwhite (tmp);
+    stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
     return (TRUE);
@@ -55,5 +55,5 @@
     bzero (tmp, 81);
     memcpy (tmp, s, Nchar);
-    gfits_stripwhite (tmp);
+    stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
     return (TRUE);
@@ -94,41 +94,2 @@
 /* if the variable argument stuff breaks on another system, look 
 at F_modify.c as it has the old code */
-
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-/* Strip whitespace from the start and end of STRING. */
-int gfits_stripwhite (char *string) {
-
-  int i;
-
-  if (string == (char *) NULL)
-    return (FALSE);
-
-  for (i = 0; whitespace (string[i]); i++);
-  if (i) memmove (string, string + i, strlen(string+i)+1);
-  for (i = strlen (string) - 1; (i > 0) && whitespace (string[i]); i--);
-  string[++i] = 0;
-
-  return (i);
-
-}
-
-# if (0)
-    one_quote = FALSE;
-    tmp[0] = *(p + 10);
-    if (tmp[0] == 0x27)
-      one_quote = TRUE;
-    /* end the string if we hit: a -- end of line (80 chars) b -- NEWLINE c -- '(0x27: single quote) (end of string) */
-    for (i = 1; (i < 70) && (p[i + 10] != NEWLINE) && ((p[i + 10] != 0x27) || !one_quote); i++) {
-      tmp[i] = *(p + 10 + i);
-      if ((tmp[i] == 0x27) && !one_quote)
-	one_quote = TRUE;
-      if ((tmp[i] == 0x2f) && !one_quote)
-	break;
-    }
-    tmp[i] = 0;
-    if ((c = strchr (tmp, 0x27)) != NULL)
-      *c = ' ';
-# endif