De-tabify; minor code-style consistency changes.

1 files changed, 51 insertions, 49 deletions

diff --git a/xmlwf/ct.c b/xmlwf/ct.c
index 098699d..95903a3 100755
--- a/xmlwf/ct.c
+++ b/xmlwf/ct.c
@@ -1,7 +1,7 @@
 #define CHARSET_MAX 41
 
-static
-const char *getTok(const char **pp)
+static const char *
+getTok(const char **pp)
 {
   enum { inAtom, inString, init, inComment };
   int state = init;
@@ -15,50 +15,50 @@ const char *getTok(const char **pp)
     case '\t':
     case '\n':
       if (state == inAtom)
-	return tokStart;
+        return tokStart;
       break;
     case '(':
       if (state == inAtom)
-	return tokStart;
+        return tokStart;
       if (state != inString)
-	state++;
+        state++;
       break;
     case ')':
       if (state > init)
-	--state;
+        --state;
       else if (state != inString)
-	return 0;
+        return 0;
       break;
     case ';':
     case '/':
     case '=':
       if (state == inAtom)
-	return tokStart;
+        return tokStart;
       if (state == init)
-	return (*pp)++;
+        return (*pp)++;
       break;
     case '\\':
       ++*pp;
       if (**pp == '\0')
-	return 0;
+        return 0;
       break;
     case '"':
       switch (state) {
       case inString:
-	++*pp;
-	return tokStart;
+        ++*pp;
+        return tokStart;
       case inAtom:
-	return tokStart;
+        return tokStart;
       case init:
-	tokStart = *pp;
-	state = inString;
-	break;
+        tokStart = *pp;
+        state = inString;
+        break;
       }
       break;
     default:
       if (state == init) {
-	tokStart = *pp;
-	state = inAtom;
+        tokStart = *pp;
+        state = inAtom;
       }
       break;
     }
@@ -69,8 +69,8 @@ const char *getTok(const char **pp)
 
 /* key must be lowercase ASCII */
 
-static
-int matchkey(const char *start, const char *end, const char *key)
+static int
+matchkey(const char *start, const char *end, const char *key)
 {
   if (!start)
     return 0;
@@ -80,7 +80,8 @@ int matchkey(const char *start, const char *end, const char *key)
   return *key == '\0';
 }
 
-void getXMLCharset(const char *buf, char *charset)
+void
+getXMLCharset(const char *buf, char *charset)
 {
   const char *next, *p;
 
@@ -102,33 +103,33 @@ void getXMLCharset(const char *buf, char *charset)
     if (*p == ';') {
       p = getTok(&next);
       if (matchkey(p, next, "charset")) {
-	p = getTok(&next);
-	if (p && *p == '=') {
-	  p = getTok(&next);
-	  if (p) {
-	    char *s = charset;
-	    if (*p == '"') {
-	      while (++p != next - 1) {
-		if (*p == '\\')
-		  ++p;
-		if (s == charset + CHARSET_MAX - 1) {
-		  charset[0] = '\0';
-		  break;
-		}
-		*s++ = *p;
-	      }
-	      *s++ = '\0';
-	    }
-	    else {
-	      if (next - p > CHARSET_MAX - 1)
-		break;
-	      while (p != next)
-		*s++ = *p++;
-	      *s = 0;
-	      break;
-	    }
-	  }
-	}
+        p = getTok(&next);
+        if (p && *p == '=') {
+          p = getTok(&next);
+          if (p) {
+            char *s = charset;
+            if (*p == '"') {
+              while (++p != next - 1) {
+                if (*p == '\\')
+                  ++p;
+                if (s == charset + CHARSET_MAX - 1) {
+                  charset[0] = '\0';
+                  break;
+                }
+                *s++ = *p;
+              }
+              *s++ = '\0';
+            }
+            else {
+              if (next - p > CHARSET_MAX - 1)
+                break;
+              while (p != next)
+                *s++ = *p++;
+              *s = 0;
+              break;
+            }
+          }
+        }
       }
     }
   else
@@ -136,7 +137,8 @@ void getXMLCharset(const char *buf, char *charset)
   }
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
   char buf[CHARSET_MAX];
   getXMLCharset(argv[1], buf);