aboutsummaryrefslogtreecommitdiffstats
path: root/xmlwf/ct.c
diff options
context:
space:
mode:
Diffstat (limited to 'xmlwf/ct.c')
-rw-r--r--xmlwf/ct.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/xmlwf/ct.c b/xmlwf/ct.c
index dd42f5ec98d8..dcf92bab568b 100644
--- a/xmlwf/ct.c
+++ b/xmlwf/ct.c
@@ -33,8 +33,7 @@
#define CHARSET_MAX 41
static const char *
-getTok(const char **pp)
-{
+getTok(const char **pp) {
enum { inAtom, inString, init, inComment };
int state = init;
const char *tokStart = 0;
@@ -102,9 +101,8 @@ getTok(const char **pp)
/* key must be lowercase ASCII */
static int
-matchkey(const char *start, const char *end, const char *key)
-{
- if (!start)
+matchkey(const char *start, const char *end, const char *key) {
+ if (! start)
return 0;
for (; start != end; start++, key++)
if (*start != *key && *start != 'A' + (*key - 'a'))
@@ -113,8 +111,7 @@ matchkey(const char *start, const char *end, const char *key)
}
void
-getXMLCharset(const char *buf, char *charset)
-{
+getXMLCharset(const char *buf, char *charset) {
const char *next, *p;
charset[0] = '\0';
@@ -122,10 +119,10 @@ getXMLCharset(const char *buf, char *charset)
p = getTok(&next);
if (matchkey(p, next, "text"))
strcpy(charset, "us-ascii");
- else if (!matchkey(p, next, "application"))
+ else if (! matchkey(p, next, "application"))
return;
p = getTok(&next);
- if (!p || *p != '/')
+ if (! p || *p != '/')
return;
p = getTok(&next);
if (matchkey(p, next, "xml"))
@@ -151,8 +148,7 @@ getXMLCharset(const char *buf, char *charset)
*s++ = *p;
}
*s++ = '\0';
- }
- else {
+ } else {
if (next - p > CHARSET_MAX - 1)
break;
while (p != next)
@@ -163,15 +159,13 @@ getXMLCharset(const char *buf, char *charset)
}
}
}
- }
- else
- p = getTok(&next);
+ } else
+ p = getTok(&next);
}
}
int
-main(int argc, char **argv)
-{
+main(int argc, char **argv) {
char buf[CHARSET_MAX];
getXMLCharset(argv[1], buf);
printf("charset = \"%s\"\n", buf);