diff options
author | fdrake <fdrake> | 2002-07-01 15:13:00 +0000 |
---|---|---|
committer | fdrake <fdrake> | 2002-07-01 15:13:00 +0000 |
commit | 79162e938ea084584199e65fcbc0058f17c74934 (patch) | |
tree | 899ed92a001bc9e0a80c8df1812b454dd54114f3 /xmlwf/ct.c | |
parent | 19df3e2e8a2f60177957fa317d2551a64a98b7db (diff) | |
download | libexpat-79162e938ea084584199e65fcbc0058f17c74934.tar.gz |
De-tabify; minor code-style consistency changes.
Diffstat (limited to 'xmlwf/ct.c')
-rwxr-xr-x | xmlwf/ct.c | 100 |
1 files changed, 51 insertions, 49 deletions
@@ -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); |