From 65ab1317a401abc1372c3e16adce0ecb66109063 Mon Sep 17 00:00:00 2001 From: "Fred L. Drake, Jr." Date: Mon, 1 Jul 2002 15:13:02 +0000 Subject: [PATCH] De-tabify; minor code-style consistency changes. --- expat/xmlwf/codepage.c | 23 ++--- expat/xmlwf/codepage.h | 5 +- expat/xmlwf/ct.c | 100 ++++++++++----------- expat/xmlwf/filemap.h | 16 ++-- expat/xmlwf/readfilemap.c | 12 +-- expat/xmlwf/unixfilemap.c | 16 ++-- expat/xmlwf/win32filemap.c | 33 +++---- expat/xmlwf/xmlfile.c | 56 ++++++------ expat/xmlwf/xmlfile.h | 5 +- expat/xmlwf/xmlmime.c | 104 +++++++++++----------- expat/xmlwf/xmlmime.h | 8 +- expat/xmlwf/xmlwf.c | 173 ++++++++++++++++++------------------- 12 files changed, 277 insertions(+), 274 deletions(-) diff --git a/expat/xmlwf/codepage.c b/expat/xmlwf/codepage.c index 12bfe508..b8fdb7a6 100755 --- a/expat/xmlwf/codepage.c +++ b/expat/xmlwf/codepage.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #include "codepage.h" @@ -11,7 +10,8 @@ See the file COPYING for copying permission. #include -int codepageMap(int cp, int *map) +int +codepageMap(int cp, int *map) { int i; CPINFO info; @@ -26,7 +26,7 @@ int codepageMap(int cp, int *map) break; lim = info.LeadByte[i + 1]; for (j = info.LeadByte[i]; j < lim; j++) - map[j] = -2; + map[j] = -2; } } for (i = 0; i < 256; i++) { @@ -34,30 +34,33 @@ int codepageMap(int cp, int *map) char c = (char)i; unsigned short n; if (MultiByteToWideChar(cp, MB_PRECOMPOSED|MB_ERR_INVALID_CHARS, - &c, 1, &n, 1) == 1) + &c, 1, &n, 1) == 1) map[i] = n; } } return 1; } -int codepageConvert(int cp, const char *p) +int +codepageConvert(int cp, const char *p) { unsigned short c; if (MultiByteToWideChar(cp, MB_PRECOMPOSED|MB_ERR_INVALID_CHARS, - p, 2, &c, 1) == 1) + p, 2, &c, 1) == 1) return c; return -1; } #else /* not WIN32 */ -int codepageMap(int cp, int *map) +int +codepageMap(int cp, int *map) { return 0; } -int codepageConvert(int cp, const char *p) +int +codepageConvert(int cp, const char *p) { return -1; } diff --git a/expat/xmlwf/codepage.h b/expat/xmlwf/codepage.h index b36a5502..6a4df688 100755 --- a/expat/xmlwf/codepage.h +++ b/expat/xmlwf/codepage.h @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ int codepageMap(int cp, int *map); diff --git a/expat/xmlwf/ct.c b/expat/xmlwf/ct.c index 098699d0..95903a34 100755 --- a/expat/xmlwf/ct.c +++ b/expat/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); diff --git a/expat/xmlwf/filemap.h b/expat/xmlwf/filemap.h index ecf01751..814edec2 100755 --- a/expat/xmlwf/filemap.h +++ b/expat/xmlwf/filemap.h @@ -1,17 +1,17 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ - #include #ifdef XML_UNICODE int filemap(const wchar_t *name, - void (*processor)(const void *, size_t, const wchar_t *, void *arg), - void *arg); + void (*processor)(const void *, size_t, + const wchar_t *, void *arg), + void *arg); #else int filemap(const char *name, - void (*processor)(const void *, size_t, const char *, void *arg), - void *arg); + void (*processor)(const void *, size_t, + const char *, void *arg), + void *arg); #endif diff --git a/expat/xmlwf/readfilemap.c b/expat/xmlwf/readfilemap.c index 4e5e5d11..b68b2ce0 100755 --- a/expat/xmlwf/readfilemap.c +++ b/expat/xmlwf/readfilemap.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #include @@ -29,9 +28,10 @@ See the file COPYING for copying permission. #include "filemap.h" -int filemap(const char *name, - void (*processor)(const void *, size_t, const char *, void *arg), - void *arg) +int +filemap(const char *name, + void (*processor)(const void *, size_t, const char *, void *arg), + void *arg) { size_t nbytes; int fd; diff --git a/expat/xmlwf/unixfilemap.c b/expat/xmlwf/unixfilemap.c index 0580f859..22048c82 100755 --- a/expat/xmlwf/unixfilemap.c +++ b/expat/xmlwf/unixfilemap.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #include @@ -18,9 +17,10 @@ See the file COPYING for copying permission. #include "filemap.h" -int filemap(const char *name, - void (*processor)(const void *, size_t, const char *, void *arg), - void *arg) +int +filemap(const char *name, + void (*processor)(const void *, size_t, const char *, void *arg), + void *arg) { int fd; size_t nbytes; @@ -42,10 +42,10 @@ int filemap(const char *name, fprintf(stderr, "%s: not a regular file\n", name); return 0; } - + nbytes = sb.st_size; p = (void *)mmap((caddr_t)0, (size_t)nbytes, PROT_READ, - MAP_FILE|MAP_PRIVATE, fd, (off_t)0); + MAP_FILE|MAP_PRIVATE, fd, (off_t)0); if (p == (void *)-1) { perror(name); close(fd); diff --git a/expat/xmlwf/win32filemap.c b/expat/xmlwf/win32filemap.c index 7546fea8..41dc35b6 100755 --- a/expat/xmlwf/win32filemap.c +++ b/expat/xmlwf/win32filemap.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #define STRICT 1 @@ -23,9 +22,10 @@ See the file COPYING for copying permission. static void win32perror(const TCHAR *); -int filemap(const TCHAR *name, - void (*processor)(const void *, size_t, const TCHAR *, void *arg), - void *arg) +int +filemap(const TCHAR *name, + void (*processor)(const void *, size_t, const TCHAR *, void *arg), + void *arg) { HANDLE f; HANDLE m; @@ -34,7 +34,7 @@ int filemap(const TCHAR *name, void *p; f = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_SEQUENTIAL_SCAN, NULL); + FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (f == INVALID_HANDLE_VALUE) { win32perror(name); return 0; @@ -75,17 +75,18 @@ int filemap(const TCHAR *name, return 1; } -static -void win32perror(const TCHAR *s) +static void +win32perror(const TCHAR *s) { LPVOID buf; - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &buf, - 0, - NULL)) { + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER + | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &buf, + 0, + NULL)) { _ftprintf(stderr, _T("%s: %s"), s, buf); fflush(stderr); LocalFree(buf); diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c index edbd216c..6bf1535f 100755 --- a/expat/xmlwf/xmlfile.c +++ b/expat/xmlwf/xmlfile.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #include @@ -41,7 +40,6 @@ See the file COPYING for copying permission. #endif - typedef struct { XML_Parser parser; int *retPtr; @@ -54,17 +52,17 @@ reportError(XML_Parser parser, const XML_Char *filename) const XML_Char *message = XML_ErrorString(code); if (message) ftprintf(stdout, T("%s:%d:%d: %s\n"), - filename, - XML_GetErrorLineNumber(parser), - XML_GetErrorColumnNumber(parser), - message); + filename, + XML_GetErrorLineNumber(parser), + XML_GetErrorColumnNumber(parser), + message); else ftprintf(stderr, T("%s: (unknown message %d)\n"), filename, code); } static void processFile(const void *data, size_t size, - const XML_Char *filename, void *args) + const XML_Char *filename, void *args) { XML_Parser parser = ((PROCESS_ARGS *)args)->parser; int *retPtr = ((PROCESS_ARGS *)args)->retPtr; @@ -88,7 +86,7 @@ isAsciiLetter(XML_Char c) static const XML_Char * resolveSystemId(const XML_Char *base, const XML_Char *systemId, - XML_Char **toFree) + XML_Char **toFree) { XML_Char *s; *toFree = 0; @@ -101,7 +99,7 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId, ) return systemId; *toFree = (XML_Char *)malloc((tcslen(base) + tcslen(systemId) + 2) - * sizeof(XML_Char)); + * sizeof(XML_Char)); if (!*toFree) return systemId; tcscpy(*toFree, base); @@ -118,10 +116,10 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId, static int externalEntityRefFilemap(XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId) + const XML_Char *context, + const XML_Char *base, + const XML_Char *systemId, + const XML_Char *publicId) { int result; XML_Char *s; @@ -157,27 +155,27 @@ processStream(const XML_Char *filename, XML_Parser parser) char *buf = XML_GetBuffer(parser, READ_SIZE); if (!buf) { if (filename != NULL) - close(fd); + close(fd); ftprintf(stderr, T("%s: out of memory\n"), - filename != NULL ? filename : "xmlwf"); + filename != NULL ? filename : "xmlwf"); return 0; } nread = read(fd, buf, READ_SIZE); if (nread < 0) { tperror(filename != NULL ? filename : "STDIN"); if (filename != NULL) - close(fd); + close(fd); return 0; } if (!XML_ParseBuffer(parser, nread, nread == 0)) { reportError(parser, filename != NULL ? filename : "STDIN"); if (filename != NULL) - close(fd); + close(fd); return 0; } if (nread == 0) { if (filename != NULL) - close(fd); + close(fd); break;; } } @@ -186,10 +184,10 @@ processStream(const XML_Char *filename, XML_Parser parser) static int externalEntityRefStream(XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId) + const XML_Char *context, + const XML_Char *base, + const XML_Char *systemId, + const XML_Char *publicId) { XML_Char *s; const XML_Char *filename; @@ -205,8 +203,8 @@ externalEntityRefStream(XML_Parser parser, int XML_ProcessFile(XML_Parser parser, - const XML_Char *filename, - unsigned flags) + const XML_Char *filename, + unsigned flags) { int result; @@ -217,9 +215,9 @@ XML_ProcessFile(XML_Parser parser, if (flags & XML_EXTERNAL_ENTITIES) XML_SetExternalEntityRefHandler(parser, - (flags & XML_MAP_FILE) - ? externalEntityRefFilemap - : externalEntityRefStream); + (flags & XML_MAP_FILE) + ? externalEntityRefFilemap + : externalEntityRefStream); if (flags & XML_MAP_FILE) { PROCESS_ARGS args; args.retPtr = &result; diff --git a/expat/xmlwf/xmlfile.h b/expat/xmlwf/xmlfile.h index 5d6bdce4..a3cbcf2b 100755 --- a/expat/xmlwf/xmlfile.h +++ b/expat/xmlwf/xmlfile.h @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #define XML_MAP_FILE 01 diff --git a/expat/xmlwf/xmlmime.c b/expat/xmlwf/xmlmime.c index 4b32c86f..56a0e7f4 100755 --- a/expat/xmlwf/xmlmime.c +++ b/expat/xmlwf/xmlmime.c @@ -1,8 +1,8 @@ #include #include "xmlmime.h" -static -const char *getTok(const char **pp) +static const char * +getTok(const char **pp) { /* inComment means one level of nesting; inComment+1 means two levels etc */ enum { inAtom, inString, init, inComment }; @@ -12,57 +12,57 @@ const char *getTok(const char **pp) switch (**pp) { case '\0': if (state == inAtom) - return tokStart; + return tokStart; return 0; case ' ': case '\r': 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; } @@ -73,8 +73,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; @@ -84,7 +84,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; @@ -108,34 +109,34 @@ 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; - } - } - } - 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; + } + } + } + break; } } else @@ -147,7 +148,8 @@ void getXMLCharset(const char *buf, char *charset) #include -int main(int argc, char **argv) +int +main(int argc, char *argv[]) { char buf[CHARSET_MAX]; if (argc <= 1) diff --git a/expat/xmlwf/xmlmime.h b/expat/xmlwf/xmlmime.h index 79654b69..bf0356df 100755 --- a/expat/xmlwf/xmlmime.h +++ b/expat/xmlwf/xmlmime.h @@ -1,4 +1,3 @@ - #ifdef __cplusplus extern "C" { #endif @@ -8,9 +7,10 @@ extern "C" { #define CHARSET_MAX 41 /* Figure out the charset to use from the ContentType. -buf contains the body of the header field (the part after "Content-Type:"). -charset gets the charset to use. It must be at least CHARSET_MAX chars long. -charset will be empty if the default charset should be used. */ + buf contains the body of the header field (the part after "Content-Type:"). + charset gets the charset to use. It must be at least CHARSET_MAX chars + long. charset will be empty if the default charset should be used. +*/ void getXMLCharset(const char *buf, char *charset); diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index 9c8e8be0..70ee4a03 100755 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -1,6 +1,5 @@ -/* -Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd -See the file COPYING for copying permission. +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. */ #include @@ -230,7 +229,7 @@ endElementNS(void *userData, const XML_Char *name) static void processingInstruction(void *userData, const XML_Char *target, - const XML_Char *data) + const XML_Char *data) { FILE *fp = userData; puttc(T('<'), fp); @@ -252,7 +251,7 @@ defaultCharacterData(XML_Parser parser, const XML_Char *s, int len) static void defaultStartElement(XML_Parser parser, const XML_Char *name, - const XML_Char **atts) + const XML_Char **atts) { XML_DefaultCurrent(parser); } @@ -265,7 +264,7 @@ defaultEndElement(XML_Parser parser, const XML_Char *name) static void defaultProcessingInstruction(XML_Parser parser, const XML_Char *target, - const XML_Char *data) + const XML_Char *data) { XML_DefaultCurrent(parser); } @@ -287,7 +286,7 @@ nopEndElement(XML_Parser parser, const XML_Char *name) static void nopProcessingInstruction(XML_Parser parser, const XML_Char *target, - const XML_Char *data) + const XML_Char *data) { } @@ -307,10 +306,10 @@ metaLocation(XML_Parser parser) ftprintf(XML_GetUserData(parser), T(" uri=\"%s\""), uri); ftprintf(XML_GetUserData(parser), T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""), - XML_GetCurrentByteIndex(parser), - XML_GetCurrentByteCount(parser), - XML_GetCurrentLineNumber(parser), - XML_GetCurrentColumnNumber(parser)); + XML_GetCurrentByteIndex(parser), + XML_GetCurrentByteCount(parser), + XML_GetCurrentLineNumber(parser), + XML_GetCurrentColumnNumber(parser)); } static void @@ -327,7 +326,7 @@ metaEndDocument(XML_Parser parser) static void metaStartElement(XML_Parser parser, const XML_Char *name, - const XML_Char **atts) + const XML_Char **atts) { FILE *fp = XML_GetUserData(parser); const XML_Char **specifiedAttsEnd @@ -347,11 +346,11 @@ metaStartElement(XML_Parser parser, const XML_Char *name, ftprintf(fp, T("= specifiedAttsEnd) - fputts(T("\" defaulted=\"yes\"/>\n"), fp); + fputts(T("\" defaulted=\"yes\"/>\n"), fp); else if (atts == idAttPtr) - fputts(T("\" id=\"yes\"/>\n"), fp); + fputts(T("\" id=\"yes\"/>\n"), fp); else - fputts(T("\"/>\n"), fp); + fputts(T("\"/>\n"), fp); } while (*(atts += 2)); fputts(T("\n"), fp); } @@ -370,7 +369,7 @@ metaEndElement(XML_Parser parser, const XML_Char *name) static void metaProcessingInstruction(XML_Parser parser, const XML_Char *target, - const XML_Char *data) + const XML_Char *data) { FILE *fp = XML_GetUserData(parser); ftprintf(fp, T(" 1) { - i++; - j = 0; - break; + i++; + j = 0; + break; } /* fall through */ default: @@ -729,7 +728,7 @@ tmain(int argc, XML_Char **argv) XML_SetParamEntityParsing(parser, paramEntityParsing); if (outputType == 't') { /* This is for doing timings; this gives a more realistic estimate of - the parsing time. */ + the parsing time. */ outputDir = 0; XML_SetElementHandler(parser, nopStartElement, nopEndElement); XML_SetCharacterDataHandler(parser, nopCharacterData); @@ -738,20 +737,20 @@ tmain(int argc, XML_Char **argv) else if (outputDir) { const XML_Char *file = useStdin ? T("STDIN") : argv[i]; if (tcsrchr(file, T('/'))) - file = tcsrchr(file, T('/')) + 1; + file = tcsrchr(file, T('/')) + 1; #ifdef WIN32 if (tcsrchr(file, T('\\'))) - file = tcsrchr(file, T('\\')) + 1; + file = tcsrchr(file, T('\\')) + 1; #endif outName = malloc((tcslen(outputDir) + tcslen(file) + 2) - * sizeof(XML_Char)); + * sizeof(XML_Char)); tcscpy(outName, outputDir); tcscat(outName, T("/")); tcscat(outName, file); fp = tfopen(outName, T("wb")); if (!fp) { - tperror(outName); - exit(1); + tperror(outName); + exit(1); } setvbuf(fp, NULL, _IOFBF, 16384); #ifdef XML_UNICODE @@ -760,39 +759,39 @@ tmain(int argc, XML_Char **argv) XML_SetUserData(parser, fp); switch (outputType) { case 'm': - XML_UseParserAsHandlerArg(parser); - XML_SetElementHandler(parser, metaStartElement, metaEndElement); - XML_SetProcessingInstructionHandler(parser, metaProcessingInstruction); - XML_SetCommentHandler(parser, metaComment); - XML_SetCdataSectionHandler(parser, metaStartCdataSection, - metaEndCdataSection); - XML_SetCharacterDataHandler(parser, metaCharacterData); - XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, - metaEndDoctypeDecl); - XML_SetEntityDeclHandler(parser, metaEntityDecl); - XML_SetNotationDeclHandler(parser, metaNotationDecl); - XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, - metaEndNamespaceDecl); - metaStartDocument(parser); - break; + XML_UseParserAsHandlerArg(parser); + XML_SetElementHandler(parser, metaStartElement, metaEndElement); + XML_SetProcessingInstructionHandler(parser, metaProcessingInstruction); + XML_SetCommentHandler(parser, metaComment); + XML_SetCdataSectionHandler(parser, metaStartCdataSection, + metaEndCdataSection); + XML_SetCharacterDataHandler(parser, metaCharacterData); + XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, + metaEndDoctypeDecl); + XML_SetEntityDeclHandler(parser, metaEntityDecl); + XML_SetNotationDeclHandler(parser, metaNotationDecl); + XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, + metaEndNamespaceDecl); + metaStartDocument(parser); + break; case 'c': - XML_UseParserAsHandlerArg(parser); - XML_SetDefaultHandler(parser, markup); - XML_SetElementHandler(parser, defaultStartElement, defaultEndElement); - XML_SetCharacterDataHandler(parser, defaultCharacterData); - XML_SetProcessingInstructionHandler(parser, - defaultProcessingInstruction); - break; + XML_UseParserAsHandlerArg(parser); + XML_SetDefaultHandler(parser, markup); + XML_SetElementHandler(parser, defaultStartElement, defaultEndElement); + XML_SetCharacterDataHandler(parser, defaultCharacterData); + XML_SetProcessingInstructionHandler(parser, + defaultProcessingInstruction); + break; default: - if (useNamespaces) - XML_SetElementHandler(parser, startElementNS, endElementNS); - else - XML_SetElementHandler(parser, startElement, endElement); - XML_SetCharacterDataHandler(parser, characterData); + if (useNamespaces) + XML_SetElementHandler(parser, startElementNS, endElementNS); + else + XML_SetElementHandler(parser, startElement, endElement); + XML_SetCharacterDataHandler(parser, characterData); #ifndef W3C14N - XML_SetProcessingInstructionHandler(parser, processingInstruction); + XML_SetProcessingInstructionHandler(parser, processingInstruction); #endif /* not W3C14N */ - break; + break; } } if (windowsCodePages) @@ -800,10 +799,10 @@ tmain(int argc, XML_Char **argv) result = XML_ProcessFile(parser, useStdin ? NULL : argv[i], processFlags); if (outputDir) { if (outputType == 'm') - metaEndDocument(parser); + metaEndDocument(parser); fclose(fp); if (!result) - tremove(outName); + tremove(outName); free(outName); } XML_ParserFree(parser); -- 2.40.0