From fdrake@users.sourceforge.net Mon Jul 1 08:46:48 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 07:46:48 2002 Subject: [Expat-checkins] expat/examples elements.c,1.1,1.2 outline.c,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv25187 Modified Files: elements.c outline.c Log Message: De-tabify; minor code-style consistency changes. Index: elements.c =================================================================== RCS file: /cvsroot/expat/expat/examples/elements.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- elements.c 26 Jul 2001 21:54:43 -0000 1.1 +++ elements.c 1 Jul 2002 14:45:51 -0000 1.2 @@ -1,7 +1,8 @@ /* This is simple demonstration of how to use expat. This program -reads an XML document from standard input and writes a line with the -name of each element to standard output indenting child elements by -one tab stop more than their parent element. */ + reads an XML document from standard input and writes a line with + the name of each element to standard output indenting child + elements by one tab stop more than their parent element. +*/ #include #include "expat.h" @@ -38,9 +39,9 @@ done = len < sizeof(buf); if (!XML_Parse(parser, buf, len, done)) { fprintf(stderr, - "%s at line %d\n", - XML_ErrorString(XML_GetErrorCode(parser)), - XML_GetCurrentLineNumber(parser)); + "%s at line %d\n", + XML_ErrorString(XML_GetErrorCode(parser)), + XML_GetCurrentLineNumber(parser)); return 1; } } while (!done); Index: outline.c =================================================================== RCS file: /cvsroot/expat/expat/examples/outline.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- outline.c 25 Jul 2001 17:04:22 -0000 1.2 +++ outline.c 1 Jul 2002 14:45:51 -0000 1.3 @@ -24,14 +24,15 @@ #include #include -#define BUFFSIZE 8192 +#define BUFFSIZE 8192 char Buff[BUFFSIZE]; int Depth; static void -start(void *data, const char *el, const char **attr) { +start(void *data, const char *el, const char **attr) +{ int i; for (i = 0; i < Depth; i++) @@ -45,15 +46,17 @@ printf("\n"); Depth++; -} /* End of start handler */ +} static void -end(void *data, const char *el) { +end(void *data, const char *el) +{ Depth--; -} /* End of end handler */ +} int -main(int argc, char *argv[]) { +main(int argc, char *argv[]) +{ XML_Parser p = XML_ParserCreate(NULL); if (! p) { fprintf(stderr, "Couldn't allocate memory for parser\n"); @@ -75,8 +78,8 @@ if (! XML_Parse(p, Buff, len, done)) { fprintf(stderr, "Parse error at line %d:\n%s\n", - XML_GetCurrentLineNumber(p), - XML_ErrorString(XML_GetErrorCode(p))); + XML_GetCurrentLineNumber(p), + XML_ErrorString(XML_GetErrorCode(p))); exit(-1); } @@ -84,5 +87,4 @@ break; } return 0; -} /* End of main */ - +} From fdrake@users.sourceforge.net Mon Jul 1 08:52:20 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 07:52:20 2002 Subject: [Expat-checkins] expat/gennmtab gennmtab.c,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat/gennmtab In directory usw-pr-cvs1:/tmp/cvs-serv26976 Modified Files: gennmtab.c Log Message: De-tabify; minor code-style consistency changes. Index: gennmtab.c =================================================================== RCS file: /cvsroot/expat/expat/gennmtab/gennmtab.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gennmtab.c 21 Sep 2000 21:20:17 -0000 1.6 +++ gennmtab.c 1 Jul 2002 14:51:16 -0000 1.7 @@ -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 @@ -354,21 +353,23 @@ { 0x30fc, 0x30fe }, }; -void setTab(char *tab, struct range *ranges, size_t nRanges) +static void +setTab(char *tab, struct range *ranges, size_t nRanges) { size_t i; int j; for (i = 0; i < nRanges; i++) { if (ranges[i].end) { for (j = ranges[i].start; j <= ranges[i].end; j++) - tab[j] = 1; + tab[j] = 1; } else tab[ranges[i].start] = 1; } } -void printTabs(char *tab) +static void +printTabs(char *tab) { int nBitmaps = 2; int i, j, k; @@ -384,21 +385,21 @@ int kind = tab[i*256]; for (j = 1; j < 256; j++) if (tab[i*256 +j] != kind) { - kind = -1; - break; + kind = -1; + break; } if (i >= 256 && memcmp(tab + (i - 256)*256, tab + i*256, 256) == 0) pageIndex[i] = pageIndex[i - 256]; else if (kind == -1) { pageIndex[i] = nBitmaps++; for (j = 0; j < 8; j++) { - unsigned val = 0; - for (k = 0; k < 32; k++) { - if (tab[i*256 + j*32 +k]) - val |= (1 << k); - } - printf("0x%08X,", val); - putchar((((j + 1) & 3) == 0) ? '\n' : ' '); + unsigned val = 0; + for (k = 0; k < 32; k++) { + if (tab[i*256 + j*32 +k]) + val |= (1 << k); + } + printf("0x%08X,", val); + putchar((((j + 1) & 3) == 0) ? '\n' : ' '); } } else @@ -415,7 +416,8 @@ printf("};\n"); } -int main() +int +main() { char tab[2*65536]; memset(tab, 0, 65536); From fdrake@users.sourceforge.net Mon Jul 1 09:14:01 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 08:14:01 2002 Subject: [Expat-checkins] expat/xmlwf codepage.c,1.10,1.11 codepage.h,1.7,1.8 ct.c,1.3,1.4 filemap.h,1.7,1.8 readfilemap.c,1.8,1.9 unixfilemap.c,1.7,1.8 win32filemap.c,1.10,1.11 xmlfile.c,1.10,1.11 xmlfile.h,1.5,1.6 xmlmime.c,1.3,1.4 xmlmime.h,1.3,1.4 xmlwf.c,1.59,1.60 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv3235 Modified Files: codepage.c codepage.h ct.c filemap.h readfilemap.c unixfilemap.c win32filemap.c xmlfile.c xmlfile.h xmlmime.c xmlmime.h xmlwf.c Log Message: De-tabify; minor code-style consistency changes. Index: codepage.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/codepage.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- codepage.c 15 May 2002 15:57:22 -0000 1.10 +++ codepage.c 1 Jul 2002 15:13:00 -0000 1.11 @@ -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 @@ #include -int codepageMap(int cp, int *map) +int +codepageMap(int cp, int *map) { int i; CPINFO info; @@ -26,7 +26,7 @@ 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 @@ 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; } Index: codepage.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/codepage.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- codepage.h 21 Sep 2000 21:20:18 -0000 1.7 +++ codepage.h 1 Jul 2002 15:13:01 -0000 1.8 @@ -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); Index: ct.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/ct.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ct.c 21 Apr 2000 04:20:31 -0000 1.3 +++ ct.c 1 Jul 2002 15:13:01 -0000 1.4 @@ -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 @@ 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 @@ /* 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 @@ 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 @@ 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 @@ } } -int main(int argc, char **argv) +int +main(int argc, char **argv) { char buf[CHARSET_MAX]; getXMLCharset(argv[1], buf); Index: filemap.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/filemap.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- filemap.h 21 Sep 2000 21:20:18 -0000 1.7 +++ filemap.h 1 Jul 2002 15:13:01 -0000 1.8 @@ -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 Index: readfilemap.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/readfilemap.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- readfilemap.c 9 Nov 2001 04:08:51 -0000 1.8 +++ readfilemap.c 1 Jul 2002 15:13:01 -0000 1.9 @@ -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 @@ #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; Index: unixfilemap.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/unixfilemap.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- unixfilemap.c 25 Jul 2001 17:13:34 -0000 1.7 +++ unixfilemap.c 1 Jul 2002 15:13:01 -0000 1.8 @@ -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 @@ #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 @@ 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); Index: win32filemap.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/win32filemap.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- win32filemap.c 21 Sep 2000 21:20:18 -0000 1.10 +++ win32filemap.c 1 Jul 2002 15:13:01 -0000 1.11 @@ -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 @@ 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 @@ 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 @@ 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); Index: xmlfile.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- xmlfile.c 13 Jun 2002 02:52:09 -0000 1.10 +++ xmlfile.c 1 Jul 2002 15:13:01 -0000 1.11 @@ -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 @@ #endif - typedef struct { XML_Parser parser; int *retPtr; @@ -54,17 +52,17 @@ 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 @@ 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 @@ ) 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 @@ 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 @@ 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 @@ 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 @@ int XML_ProcessFile(XML_Parser parser, - const XML_Char *filename, - unsigned flags) + const XML_Char *filename, + unsigned flags) { int result; @@ -217,9 +215,9 @@ 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; Index: xmlfile.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- xmlfile.h 21 Sep 2000 21:20:18 -0000 1.5 +++ xmlfile.h 1 Jul 2002 15:13:01 -0000 1.6 @@ -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 Index: xmlmime.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlmime.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xmlmime.c 21 Apr 2000 04:20:31 -0000 1.3 +++ xmlmime.c 1 Jul 2002 15:13:02 -0000 1.4 @@ -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 @@ 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 @@ /* 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 @@ 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 @@ 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 @@ #include -int main(int argc, char **argv) +int +main(int argc, char *argv[]) { char buf[CHARSET_MAX]; if (argc <= 1) Index: xmlmime.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlmime.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xmlmime.h 21 Apr 2000 04:20:31 -0000 1.3 +++ xmlmime.h 1 Jul 2002 15:13:02 -0000 1.4 @@ -1,4 +1,3 @@ - #ifdef __cplusplus extern "C" { #endif @@ -8,9 +7,10 @@ #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); Index: xmlwf.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- xmlwf.c 17 May 2002 17:21:51 -0000 1.59 +++ xmlwf.c 1 Jul 2002 15:13:02 -0000 1.60 @@ -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 @@ 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 @@ 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 @@ 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 @@ static void nopProcessingInstruction(XML_Parser parser, const XML_Char *target, - const XML_Char *data) + const XML_Char *data) { } @@ -307,10 +306,10 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); From fdrake@users.sourceforge.net Mon Jul 1 09:19:14 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 08:19:14 2002 Subject: [Expat-checkins] expat/xmlwf xmlfile.h,1.6,1.7 xmlurl.h,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv5759 Modified Files: xmlfile.h xmlurl.h Log Message: De-tabify files that missed the de-tabify step. Index: xmlfile.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- xmlfile.h 1 Jul 2002 15:13:01 -0000 1.6 +++ xmlfile.h 1 Jul 2002 15:18:34 -0000 1.7 @@ -6,5 +6,5 @@ #define XML_EXTERNAL_ENTITIES 02 extern int XML_ProcessFile(XML_Parser parser, - const XML_Char *filename, - unsigned flags); + const XML_Char *filename, + unsigned flags); Index: xmlurl.h =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlurl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xmlurl.h 21 Apr 2000 04:20:31 -0000 1.3 +++ xmlurl.h 1 Jul 2002 15:18:34 -0000 1.4 @@ -5,8 +5,8 @@ int XML_URLInit(); void XML_URLUninit(); int XML_ProcessURL(XML_Parser parser, - const XML_Char *url, - unsigned flags); + const XML_Char *url, + unsigned flags); #ifdef __cplusplus } From fdrake@users.sourceforge.net Mon Jul 1 10:47:15 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 09:47:15 2002 Subject: [Expat-checkins] expat/lib xmlrole.c,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv7924 Modified Files: xmlrole.c Log Message: De-tabify; minor code-style consistency changes. Removed function that was commented out using "#if 0"; not referenced. Index: xmlrole.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- xmlrole.c 20 May 2002 11:06:41 -0000 1.8 +++ xmlrole.c 1 Jul 2002 16:45:37 -0000 1.9 @@ -56,10 +56,10 @@ #endif /* not XML_DTD */ typedef int PROLOG_HANDLER(PROLOG_STATE *state, - int tok, - const char *ptr, - const char *end, - const ENCODING *enc); + int tok, + const char *ptr, + const char *end, + const ENCODING *enc); [...1142 lines suppressed...] @@ -1267,7 +1244,8 @@ return XML_ROLE_ERROR; } -void XmlPrologStateInit(PROLOG_STATE *state) +void +XmlPrologStateInit(PROLOG_STATE *state) { state->handler = prolog0; #ifdef XML_DTD @@ -1279,7 +1257,8 @@ #ifdef XML_DTD -void XmlPrologStateInitExternalEntity(PROLOG_STATE *state) +void +XmlPrologStateInitExternalEntity(PROLOG_STATE *state) { state->handler = externalSubset0; state->documentEntity = 0; From fdrake@users.sourceforge.net Mon Jul 1 10:47:49 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 09:47:49 2002 Subject: [Expat-checkins] expat/lib expat.h,1.25,1.26 xmlrole.h,1.5,1.6 xmltok.c,1.17,1.18 xmltok.h,1.4,1.5 xmltok_impl.c,1.3,1.4 xmltok_ns.c,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv8133 Modified Files: expat.h xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_ns.c Log Message: De-tabify; minor code-style consistency changes. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- expat.h 12 Jun 2002 19:43:51 -0000 1.25 +++ expat.h 1 Jul 2002 16:46:05 -0000 1.26 @@ -84,11 +84,11 @@ typedef struct XML_cp XML_Content; struct XML_cp { - enum XML_Content_Type type; - enum XML_Content_Quant quant; - XML_Char * name; - unsigned int numchildren; - XML_Content * children; + enum XML_Content_Type type; + enum XML_Content_Quant quant; + XML_Char * name; + unsigned int numchildren; + XML_Content * children; }; @@ -102,7 +102,7 @@ XMLPARSEAPI(void) XML_SetElementDeclHandler(XML_Parser parser, - XML_ElementDeclHandler eldecl); + XML_ElementDeclHandler eldecl); /* The Attlist declaration handler is called for *each* attribute. So a single Attlist declaration with multiple attributes declared will @@ -112,16 +112,16 @@ value will be NULL in the case of "#REQUIRED". If "isrequired" is true and default is non-NULL, then this is a "#FIXED" default. */ -typedef void (*XML_AttlistDeclHandler) (void *userData, +typedef void (*XML_AttlistDeclHandler) (void *userData, const XML_Char *elname, const XML_Char *attname, const XML_Char *att_type, const XML_Char *dflt, - int isrequired); + int isrequired); XMLPARSEAPI(void) XML_SetAttlistDeclHandler(XML_Parser parser, - XML_AttlistDeclHandler attdecl); + XML_AttlistDeclHandler attdecl); /* The XML declaration handler is called for *both* XML declarations and text declarations. The way to distinguish is that the version @@ -131,14 +131,14 @@ was no standalone parameter in the declaration, that it was given as no, or that it was given as yes. */ -typedef void (*XML_XmlDeclHandler) (void *userData, - const XML_Char *version, - const XML_Char *encoding, - int standalone); +typedef void (*XML_XmlDeclHandler) (void *userData, + const XML_Char *version, + const XML_Char *encoding, + int standalone); XMLPARSEAPI(void) XML_SetXmlDeclHandler(XML_Parser parser, - XML_XmlDeclHandler xmldecl); + XML_XmlDeclHandler xmldecl); typedef struct { @@ -179,8 +179,8 @@ */ XMLPARSEAPI(XML_Parser) XML_ParserCreate_MM(const XML_Char *encoding, - const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); + const XML_Memory_Handling_Suite *memsuite, + const XML_Char *namespaceSeparator); /* Prepare a parser object to be re-used. This is particularly valuable when memory allocation overhead is disproportionatly high, @@ -275,10 +275,10 @@ const XML_Char *systemId, const XML_Char *publicId, const XML_Char *notationName); - + XMLPARSEAPI(void) XML_SetEntityDeclHandler(XML_Parser parser, - XML_EntityDeclHandler handler); + XML_EntityDeclHandler handler); /* OBSOLETE -- OBSOLETE -- OBSOLETE This handler has been superceded by the EntityDeclHandler above. @@ -456,8 +456,8 @@ XMLPARSEAPI(void) XML_SetElementHandler(XML_Parser parser, - XML_StartElementHandler start, - XML_EndElementHandler end); + XML_StartElementHandler start, + XML_EndElementHandler end); XMLPARSEAPI(void) XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler); @@ -467,19 +467,19 @@ XMLPARSEAPI(void) XML_SetCharacterDataHandler(XML_Parser parser, - XML_CharacterDataHandler handler); + XML_CharacterDataHandler handler); XMLPARSEAPI(void) XML_SetProcessingInstructionHandler(XML_Parser parser, - XML_ProcessingInstructionHandler handler); + XML_ProcessingInstructionHandler handler); XMLPARSEAPI(void) XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler); XMLPARSEAPI(void) XML_SetCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start, - XML_EndCdataSectionHandler end); + XML_StartCdataSectionHandler start, + XML_EndCdataSectionHandler end); XMLPARSEAPI(void) XML_SetStartCdataSectionHandler(XML_Parser parser, @@ -495,7 +495,7 @@ */ XMLPARSEAPI(void) XML_SetDefaultHandler(XML_Parser parser, - XML_DefaultHandler handler); + XML_DefaultHandler handler); /* This sets the default handler but does not inhibit expansion of internal entities. The entity reference will not be passed to the @@ -503,49 +503,49 @@ */ XMLPARSEAPI(void) XML_SetDefaultHandlerExpand(XML_Parser parser, - XML_DefaultHandler handler); + XML_DefaultHandler handler); XMLPARSEAPI(void) XML_SetDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start, - XML_EndDoctypeDeclHandler end); + XML_StartDoctypeDeclHandler start, + XML_EndDoctypeDeclHandler end); XMLPARSEAPI(void) XML_SetStartDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start); + XML_StartDoctypeDeclHandler start); XMLPARSEAPI(void) XML_SetEndDoctypeDeclHandler(XML_Parser parser, - XML_EndDoctypeDeclHandler end); + XML_EndDoctypeDeclHandler end); XMLPARSEAPI(void) XML_SetUnparsedEntityDeclHandler(XML_Parser parser, - XML_UnparsedEntityDeclHandler handler); + XML_UnparsedEntityDeclHandler handler); XMLPARSEAPI(void) XML_SetNotationDeclHandler(XML_Parser parser, - XML_NotationDeclHandler handler); + XML_NotationDeclHandler handler); XMLPARSEAPI(void) XML_SetNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); + XML_StartNamespaceDeclHandler start, + XML_EndNamespaceDeclHandler end); XMLPARSEAPI(void) XML_SetStartNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start); + XML_StartNamespaceDeclHandler start); XMLPARSEAPI(void) XML_SetEndNamespaceDeclHandler(XML_Parser parser, - XML_EndNamespaceDeclHandler end); + XML_EndNamespaceDeclHandler end); XMLPARSEAPI(void) XML_SetNotStandaloneHandler(XML_Parser parser, - XML_NotStandaloneHandler handler); + XML_NotStandaloneHandler handler); XMLPARSEAPI(void) XML_SetExternalEntityRefHandler(XML_Parser parser, - XML_ExternalEntityRefHandler handler); + XML_ExternalEntityRefHandler handler); /* If a non-NULL value for arg is specified here, then it will be passed as the first argument to the external entity ref handler @@ -556,12 +556,12 @@ XMLPARSEAPI(void) XML_SetSkippedEntityHandler(XML_Parser parser, - XML_SkippedEntityHandler handler); + XML_SkippedEntityHandler handler); XMLPARSEAPI(void) XML_SetUnknownEncodingHandler(XML_Parser parser, - XML_UnknownEncodingHandler handler, - void *encodingHandlerData); + XML_UnknownEncodingHandler handler, + void *encodingHandlerData); /* This can be called within a handler for a start element, end element, processing instruction or character data. It causes the @@ -667,8 +667,8 @@ */ XMLPARSEAPI(XML_Parser) XML_ExternalEntityParserCreate(XML_Parser parser, - const XML_Char *context, - const XML_Char *encoding); + const XML_Char *context, + const XML_Char *encoding); enum XML_ParamEntityParsing { XML_PARAM_ENTITY_PARSING_NEVER, @@ -699,7 +699,7 @@ */ XMLPARSEAPI(int) XML_SetParamEntityParsing(XML_Parser parser, - enum XML_ParamEntityParsing parsing); + enum XML_ParamEntityParsing parsing); enum XML_Error { XML_ERROR_NONE, @@ -765,8 +765,8 @@ */ XMLPARSEAPI(const char *) XML_GetInputContext(XML_Parser parser, - int *offset, - int *size); + int *offset, + int *size); /* For backwards compatibility with previous versions. */ #define XML_GetErrorLineNumber XML_GetCurrentLineNumber Index: xmlrole.h =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlrole.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- xmlrole.h 5 Jun 2002 04:13:10 -0000 1.5 +++ xmlrole.h 1 Jul 2002 16:46:06 -0000 1.6 @@ -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. */ #ifndef XmlRole_INCLUDED @@ -80,10 +79,10 @@ typedef struct prolog_state { int (*handler)(struct prolog_state *state, - int tok, - const char *ptr, - const char *end, - const ENCODING *enc); + int tok, + const char *ptr, + const char *end, + const ENCODING *enc); unsigned level; #ifdef XML_DTD unsigned includeLevel; Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- xmltok.c 9 Jun 2002 14:01:47 -0000 1.17 +++ xmltok.c 1 Jul 2002 16:46:06 -0000 1.18 @@ -54,7 +54,7 @@ #define UTF8_GET_NAMING3(pages, byte) \ (namingBitmap[((pages)[((((byte)[0]) & 0xF) << 4) \ + ((((byte)[1]) >> 2) & 0xF)] \ - << 3) \ + << 3) \ + ((((byte)[1]) & 3) << 1) \ + ((((byte)[2]) >> 5) & 1)] \ & (1 << (((byte)[2]) & 0x1F))) @@ -300,8 +300,8 @@ static void utf8_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) + const char **fromP, const char *fromLim, + char **toP, const char *toLim) { char *to; const char *from; @@ -309,7 +309,7 @@ /* Avoid copying partial characters. */ for (fromLim = *fromP + (toLim - *toP); fromLim > *fromP; fromLim--) if (((unsigned char)fromLim[-1] & 0xc0) != 0x80) - break; + break; } for (to = *toP, from = *fromP; from != fromLim; from++, to++) *to = *from; @@ -319,8 +319,8 @@ static void utf8_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) { unsigned short *to = *toP; const char *from = *fromP; @@ -337,16 +337,16 @@ break; case BT_LEAD4: { - unsigned long n; - if (to + 1 == toLim) - break; - n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) + unsigned long n; + if (to + 1 == toLim) + break; + n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f); - n -= 0x10000; - to[0] = (unsigned short)((n >> 10) | 0xD800); - to[1] = (unsigned short)((n & 0x3FF) | 0xDC00); - to += 2; - from += 4; + n -= 0x10000; + to[0] = (unsigned short)((n >> 10) | 0xD800); + to[1] = (unsigned short)((n & 0x3FF) | 0xDC00); + to += 2; + from += 4; } break; default: @@ -406,8 +406,8 @@ static void latin1_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) + const char **fromP, const char *fromLim, + char **toP, const char *toLim) { for (;;) { unsigned char c; @@ -416,14 +416,14 @@ c = (unsigned char)**fromP; if (c & 0x80) { if (toLim - *toP < 2) - break; + break; *(*toP)++ = (char)((c >> 6) | UTF8_cval2); *(*toP)++ = (char)((c & 0x3f) | 0x80); (*fromP)++; } else { if (*toP == toLim) - break; + break; *(*toP)++ = *(*fromP)++; } } @@ -431,8 +431,8 @@ static void latin1_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) { while (*fromP != fromLim && *toP != toLim) *(*toP)++ = (unsigned char)*(*fromP)++; @@ -464,8 +464,8 @@ static void ascii_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) + const char **fromP, const char *fromLim, + char **toP, const char *toLim) { while (*fromP != fromLim && *toP != toLim) *(*toP)++ = *(*fromP)++; @@ -517,8 +517,8 @@ #define DEFINE_UTF16_TO_UTF8(E) \ static void \ E ## toUtf8(const ENCODING *enc, \ - const char **fromP, const char *fromLim, \ - char **toP, const char *toLim) \ + const char **fromP, const char *fromLim, \ + char **toP, const char *toLim) \ { \ const char *from; \ for (from = *fromP; from != fromLim; from += 2) { \ @@ -531,7 +531,7 @@ if (lo < 0x80) { \ if (*toP == toLim) { \ *fromP = from; \ - return; \ + return; \ } \ *(*toP)++ = lo; \ break; \ @@ -541,7 +541,7 @@ case 0x4: case 0x5: case 0x6: case 0x7: \ if (toLim - *toP < 2) { \ *fromP = from; \ - return; \ + return; \ } \ *(*toP)++ = ((lo >> 6) | (hi << 2) | UTF8_cval2); \ *(*toP)++ = ((lo & 0x3f) | 0x80); \ @@ -549,7 +549,7 @@ default: \ if (toLim - *toP < 3) { \ *fromP = from; \ - return; \ + return; \ } \ /* 16 bits divided 4, 6, 6 amongst 3 bytes */ \ *(*toP)++ = ((hi >> 4) | UTF8_cval3); \ @@ -558,8 +558,8 @@ break; \ case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ if (toLim - *toP < 4) { \ - *fromP = from; \ - return; \ + *fromP = from; \ + return; \ } \ plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \ *(*toP)++ = ((plane >> 2) | UTF8_cval4); \ @@ -567,9 +567,9 @@ from += 2; \ lo2 = GET_LO(from); \ *(*toP)++ = (((lo & 0x3) << 4) \ - | ((GET_HI(from) & 0x3) << 2) \ - | (lo2 >> 6) \ - | 0x80); \ + | ((GET_HI(from) & 0x3) << 2) \ + | (lo2 >> 6) \ + | 0x80); \ *(*toP)++ = ((lo2 & 0x3f) | 0x80); \ break; \ } \ @@ -580,8 +580,8 @@ #define DEFINE_UTF16_TO_UTF16(E) \ static void \ E ## toUtf16(const ENCODING *enc, \ - const char **fromP, const char *fromLim, \ - unsigned short **toP, const unsigned short *toLim) \ + const char **fromP, const char *fromLim, \ + unsigned short **toP, const unsigned short *toLim) \ { \ /* Avoid copying first half only of surrogate */ \ if (fromLim - *fromP > ((toLim - *toP) << 1) \ @@ -914,7 +914,7 @@ static void initUpdatePosition(const ENCODING *enc, const char *ptr, - const char *end, POSITION *pos) + const char *end, POSITION *pos) { normal_updatePosition(&utf8_encoding.enc, ptr, end, pos); } @@ -938,7 +938,7 @@ case 0x20: case 0xD: case 0xA: - case 0x9: + case 0x9: return 1; } return 0; @@ -949,12 +949,12 @@ */ static int parsePseudoAttribute(const ENCODING *enc, - const char *ptr, - const char *end, - const char **namePtr, - const char **nameEndPtr, - const char **valPtr, - const char **nextTokPtr) + const char *ptr, + const char *end, + const char **namePtr, + const char **nameEndPtr, + const char **valPtr, + const char **nextTokPtr) { int c; char open; @@ -987,11 +987,11 @@ if (isSpace(c)) { *nameEndPtr = ptr; do { - ptr += enc->minBytesPerChar; + ptr += enc->minBytesPerChar; } while (isSpace(c = toAscii(enc, ptr, end))); if (c != ASCII_EQUALS) { - *nextTokPtr = ptr; - return 0; + *nextTokPtr = ptr; + return 0; } break; } @@ -1019,11 +1019,11 @@ if (c == open) break; if (!(ASCII_a <= c && c <= ASCII_z) - && !(ASCII_A <= c && c <= ASCII_Z) - && !(ASCII_0 <= c && c <= ASCII_9) - && c != ASCII_PERIOD - && c != ASCII_MINUS - && c != ASCII_UNDERSCORE) { + && !(ASCII_A <= c && c <= ASCII_Z) + && !(ASCII_0 <= c && c <= ASCII_9) + && c != ASCII_PERIOD + && c != ASCII_MINUS + && c != ASCII_UNDERSCORE) { *nextTokPtr = ptr; return 0; } @@ -1055,18 +1055,18 @@ static int doParseXmlDecl(const ENCODING *(*encodingFinder)(const ENCODING *, - const char *, - const char *), - int isGeneralTextEntity, - const ENCODING *enc, - const char *ptr, - const char *end, - const char **badPtr, - const char **versionPtr, - const char **versionEndPtr, - const char **encodingName, - const ENCODING **encoding, - int *standalone) + const char *, + const char *), + int isGeneralTextEntity, + const ENCODING *enc, + const char *ptr, + const char *end, + const char **badPtr, + const char **versionPtr, + const char **versionEndPtr, + const char **encodingName, + const ENCODING **encoding, + int *standalone) { const char *val = NULL; const char *name = NULL; @@ -1095,9 +1095,9 @@ } if (!name) { if (isGeneralTextEntity) { - /* a TextDecl must have an EncodingDecl */ - *badPtr = ptr; - return 0; + /* a TextDecl must have an EncodingDecl */ + *badPtr = ptr; + return 0; } return 1; } @@ -1237,7 +1237,7 @@ unknown_isName(const ENCODING *enc, const char *p) { int c = ((const struct unknown_encoding *)enc) - ->convert(((const struct unknown_encoding *)enc)->userData, p); + ->convert(((const struct unknown_encoding *)enc)->userData, p); if (c & ~0xFFFF) return 0; return UCS2_GET_NAMING(namePages, c >> 8, c & 0xFF); @@ -1247,7 +1247,7 @@ unknown_isNmstrt(const ENCODING *enc, const char *p) { int c = ((const struct unknown_encoding *)enc) - ->convert(((const struct unknown_encoding *)enc)->userData, p); + ->convert(((const struct unknown_encoding *)enc)->userData, p); if (c & ~0xFFFF) return 0; return UCS2_GET_NAMING(nmstrtPages, c >> 8, c & 0xFF); @@ -1257,14 +1257,14 @@ unknown_isInvalid(const ENCODING *enc, const char *p) { int c = ((const struct unknown_encoding *)enc) - ->convert(((const struct unknown_encoding *)enc)->userData, p); + ->convert(((const struct unknown_encoding *)enc)->userData, p); return (c & ~0xFFFF) || checkCharRefNumber(c) < 0; } static void unknown_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) + const char **fromP, const char *fromLim, + char **toP, const char *toLim) { char buf[XML_UTF8_ENCODE_MAX]; for (;;) { @@ -1276,18 +1276,18 @@ n = *utf8++; if (n == 0) { int c = ((const struct unknown_encoding *)enc) - ->convert(((const struct unknown_encoding *)enc)->userData, + ->convert(((const struct unknown_encoding *)enc)->userData, *fromP); n = XmlUtf8Encode(c, buf); if (n > toLim - *toP) - break; + break; utf8 = buf; *fromP += ((const struct normal_encoding *)enc)->type[(unsigned char)**fromP] - - (BT_LEAD2 - 2); + - (BT_LEAD2 - 2); } else { if (n > toLim - *toP) - break; + break; (*fromP)++; } do { @@ -1298,17 +1298,17 @@ static void unknown_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) { while (*fromP != fromLim && *toP != toLim) { unsigned short c = ((const struct unknown_encoding *)enc)->utf16[(unsigned char)**fromP]; if (c == 0) { c = (unsigned short)((const struct unknown_encoding *)enc) - ->convert(((const struct unknown_encoding *)enc)->userData, *fromP); + ->convert(((const struct unknown_encoding *)enc)->userData, *fromP); *fromP += ((const struct normal_encoding *)enc)->type[(unsigned char)**fromP] - - (BT_LEAD2 - 2); + - (BT_LEAD2 - 2); } else (*fromP)++; @@ -1318,9 +1318,9 @@ ENCODING * XmlInitUnknownEncoding(void *mem, - int *table, - int (*convert)(void *userData, const char *p), - void *userData) + int *table, + int (*convert)(void *userData, const char *p), + void *userData) { int i; struct unknown_encoding *e = mem; @@ -1329,7 +1329,7 @@ for (i = 0; i < 128; i++) if (latin1_encoding.type[i] != BT_OTHER && latin1_encoding.type[i] != BT_NONXML - && table[i] != i) + && table[i] != i) return 0; for (i = 0; i < 256; i++) { int c = table[i]; @@ -1342,16 +1342,16 @@ } else if (c < 0) { if (c < -4) - return 0; + return 0; e->normal.type[i] = (unsigned char)(BT_LEAD2 - (c + 2)); e->utf8[i][0] = 0; e->utf16[i] = 0; } else if (c < 0x80) { if (latin1_encoding.type[c] != BT_OTHER - && latin1_encoding.type[c] != BT_NONXML - && c != i) - return 0; + && latin1_encoding.type[c] != BT_NONXML + && c != i) + return 0; e->normal.type[i] = latin1_encoding.type[c]; e->utf8[i][0] = 1; e->utf8[i][1] = (char)c; @@ -1366,13 +1366,13 @@ } else { if (c > 0xFFFF) - return 0; + return 0; if (UCS2_GET_NAMING(nmstrtPages, c >> 8, c & 0xff)) - e->normal.type[i] = BT_NMSTRT; + e->normal.type[i] = BT_NMSTRT; else if (UCS2_GET_NAMING(namePages, c >> 8, c & 0xff)) - e->normal.type[i] = BT_NAME; + e->normal.type[i] = BT_NAME; else - e->normal.type[i] = BT_OTHER; + e->normal.type[i] = BT_OTHER; e->utf8[i][0] = (char)XmlUtf8Encode(c, e->utf8[i] + 1); e->utf16[i] = (unsigned short)c; } @@ -1417,10 +1417,10 @@ ASCII_U, ASCII_S, ASCII_MINUS, ASCII_A, ASCII_S, ASCII_C, ASCII_I, ASCII_I, '\0' }; -static const char KW_UTF_8[] = { +static const char KW_UTF_8[] = { ASCII_U, ASCII_T, ASCII_F, ASCII_MINUS, ASCII_8, '\0' }; -static const char KW_UTF_16[] = { +static const char KW_UTF_16[] = { ASCII_U, ASCII_T, ASCII_F, ASCII_MINUS, ASCII_1, ASCII_6, '\0' }; static const char KW_UTF_16BE[] = { @@ -1469,11 +1469,11 @@ static int initScan(const ENCODING **encodingTable, - const INIT_ENCODING *enc, - int state, - const char *ptr, - const char *end, - const char **nextTokPtr) + const INIT_ENCODING *enc, + int state, + const char *ptr, + const char *end, + const char **nextTokPtr) { const ENCODING **encPtr; @@ -1500,8 +1500,8 @@ case 0xFF: case 0xEF: /* possibly first byte of UTF-8 BOM */ if (INIT_ENC_INDEX(enc) == ISO_8859_1_ENC - && state == XML_CONTENT_STATE) - break; + && state == XML_CONTENT_STATE) + break; /* fall through */ case 0x00: case 0x3C: @@ -1512,23 +1512,23 @@ switch (((unsigned char)ptr[0] << 8) | (unsigned char)ptr[1]) { case 0xFEFF: if (INIT_ENC_INDEX(enc) == ISO_8859_1_ENC - && state == XML_CONTENT_STATE) - break; + && state == XML_CONTENT_STATE) + break; *nextTokPtr = ptr + 2; *encPtr = encodingTable[UTF_16BE_ENC]; return XML_TOK_BOM; /* 00 3C is handled in the default case */ case 0x3C00: if ((INIT_ENC_INDEX(enc) == UTF_16BE_ENC - || INIT_ENC_INDEX(enc) == UTF_16_ENC) - && state == XML_CONTENT_STATE) - break; + || INIT_ENC_INDEX(enc) == UTF_16_ENC) + && state == XML_CONTENT_STATE) + break; *encPtr = encodingTable[UTF_16LE_ENC]; return XmlTok(*encPtr, state, ptr, end, nextTokPtr); case 0xFFFE: if (INIT_ENC_INDEX(enc) == ISO_8859_1_ENC - && state == XML_CONTENT_STATE) - break; + && state == XML_CONTENT_STATE) + break; *nextTokPtr = ptr + 2; *encPtr = encodingTable[UTF_16LE_ENC]; return XML_TOK_BOM; @@ -1537,50 +1537,50 @@ /* If there's an explicitly specified (external) encoding of ISO-8859-1 or some flavour of UTF-16 and this is an external text entity, - don't look for the BOM, + don't look for the BOM, because it might be a legal data. */ if (state == XML_CONTENT_STATE) { - int e = INIT_ENC_INDEX(enc); - if (e == ISO_8859_1_ENC || e == UTF_16BE_ENC + int e = INIT_ENC_INDEX(enc); + if (e == ISO_8859_1_ENC || e == UTF_16BE_ENC || e == UTF_16LE_ENC || e == UTF_16_ENC) - break; + break; } if (ptr + 2 == end) - return XML_TOK_PARTIAL; + return XML_TOK_PARTIAL; if ((unsigned char)ptr[2] == 0xBF) { - *nextTokPtr = ptr + 3; - *encPtr = encodingTable[UTF_8_ENC]; - return XML_TOK_BOM; + *nextTokPtr = ptr + 3; + *encPtr = encodingTable[UTF_8_ENC]; + return XML_TOK_BOM; } break; default: if (ptr[0] == '\0') { - /* 0 isn't a legal data character. Furthermore a document - entity can only start with ASCII characters. So the only - way this can fail to be big-endian UTF-16 if it it's an - external parsed general entity that's labelled as - UTF-16LE. + /* 0 isn't a legal data character. Furthermore a document + entity can only start with ASCII characters. So the only + way this can fail to be big-endian UTF-16 if it it's an + external parsed general entity that's labelled as + UTF-16LE. */ - if (state == XML_CONTENT_STATE && INIT_ENC_INDEX(enc) == UTF_16LE_ENC) - break; - *encPtr = encodingTable[UTF_16BE_ENC]; - return XmlTok(*encPtr, state, ptr, end, nextTokPtr); + if (state == XML_CONTENT_STATE && INIT_ENC_INDEX(enc) == UTF_16LE_ENC) + break; + *encPtr = encodingTable[UTF_16BE_ENC]; + return XmlTok(*encPtr, state, ptr, end, nextTokPtr); } else if (ptr[1] == '\0') { - /* We could recover here in the case: - - parsing an external entity - - second byte is 0 - - no externally specified encoding - - no encoding declaration - by assuming UTF-16LE. But we don't, because this would mean when - presented just with a single byte, we couldn't reliably determine - whether we needed further bytes. + /* We could recover here in the case: + - parsing an external entity + - second byte is 0 + - no externally specified encoding + - no encoding declaration + by assuming UTF-16LE. But we don't, because this would mean when + presented just with a single byte, we couldn't reliably determine + whether we needed further bytes. */ - if (state == XML_CONTENT_STATE) - break; - *encPtr = encodingTable[UTF_16LE_ENC]; - return XmlTok(*encPtr, state, ptr, end, nextTokPtr); + if (state == XML_CONTENT_STATE) + break; + *encPtr = encodingTable[UTF_16LE_ENC]; + return XmlTok(*encPtr, state, ptr, end, nextTokPtr); } break; } @@ -1608,9 +1608,9 @@ ENCODING * XmlInitUnknownEncodingNS(void *mem, - int *table, - int (*convert)(void *userData, const char *p), - void *userData) + int *table, + int (*convert)(void *userData, const char *p), + void *userData) { ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData); if (enc) Index: xmltok.h =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- xmltok.h 17 May 2002 19:12:54 -0000 1.4 +++ xmltok.h 1 Jul 2002 16:46:08 -0000 1.5 @@ -127,39 +127,39 @@ struct encoding { int (*scanners[XML_N_STATES])(const ENCODING *, - const char *, - const char *, - const char **); + const char *, + const char *, + const char **); int (*literalScanners[XML_N_LITERAL_TYPES])(const ENCODING *, - const char *, - const char *, - const char **); + const char *, + const char *, + const char **); int (*sameName)(const ENCODING *, - const char *, const char *); + const char *, const char *); int (*nameMatchesAscii)(const ENCODING *, - const char *, const char *, const char *); + const char *, const char *, const char *); int (*nameLength)(const ENCODING *, const char *); const char *(*skipS)(const ENCODING *, const char *); int (*getAtts)(const ENCODING *enc, const char *ptr, - int attsMax, ATTRIBUTE *atts); + int attsMax, ATTRIBUTE *atts); int (*charRefNumber)(const ENCODING *enc, const char *ptr); int (*predefinedEntityName)(const ENCODING *, const char *, const char *); void (*updatePosition)(const ENCODING *, - const char *ptr, - const char *end, - POSITION *); + const char *ptr, + const char *end, + POSITION *); int (*isPublicId)(const ENCODING *enc, const char *ptr, const char *end, - const char **badPtr); + const char **badPtr); void (*utf8Convert)(const ENCODING *enc, - const char **fromP, - const char *fromLim, - char **toP, - const char *toLim); + const char **fromP, + const char *fromLim, + char **toP, + const char *toLim); void (*utf16Convert)(const ENCODING *enc, - const char **fromP, - const char *fromLim, - unsigned short **toP, - const unsigned short *toLim); + const char **fromP, + const char *fromLim, + unsigned short **toP, + const unsigned short *toLim); int minBytesPerChar; char isUtf8; char isUtf16; @@ -256,15 +256,15 @@ } INIT_ENCODING; int XmlParseXmlDecl(int isGeneralTextEntity, - const ENCODING *enc, - const char *ptr, - const char *end, - const char **badPtr, - const char **versionPtr, - const char **versionEndPtr, - const char **encodingNamePtr, - const ENCODING **namedEncodingPtr, - int *standalonePtr); + const ENCODING *enc, + const char *ptr, + const char *end, + const char **badPtr, + const char **versionPtr, + const char **versionEndPtr, + const char **encodingNamePtr, + const ENCODING **namedEncodingPtr, + int *standalonePtr); int XmlInitEncoding(INIT_ENCODING *, const ENCODING **, const char *name); const ENCODING *XmlGetUtf8InternalEncoding(void); @@ -275,28 +275,28 @@ int XmlSizeOfUnknownEncoding(void); ENCODING * XmlInitUnknownEncoding(void *mem, - int *table, - int (*conv)(void *userData, const char *p), - void *userData); + int *table, + int (*conv)(void *userData, const char *p), + void *userData); int XmlParseXmlDeclNS(int isGeneralTextEntity, - const ENCODING *enc, - const char *ptr, - const char *end, - const char **badPtr, - const char **versionPtr, - const char **versionEndPtr, - const char **encodingNamePtr, - const ENCODING **namedEncodingPtr, - int *standalonePtr); + const ENCODING *enc, + const char *ptr, + const char *end, + const char **badPtr, + const char **versionPtr, + const char **versionEndPtr, + const char **encodingNamePtr, + const ENCODING **namedEncodingPtr, + int *standalonePtr); int XmlInitEncodingNS(INIT_ENCODING *, const ENCODING **, const char *name); const ENCODING *XmlGetUtf8InternalEncodingNS(void); const ENCODING *XmlGetUtf16InternalEncodingNS(void); ENCODING * XmlInitUnknownEncodingNS(void *mem, - int *table, - int (*conv)(void *userData, const char *p), - void *userData); + int *table, + int (*conv)(void *userData, const char *p), + void *userData); #ifdef __cplusplus } #endif Index: xmltok_impl.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xmltok_impl.c 20 Oct 2000 15:14:36 -0000 1.3 +++ xmltok_impl.c 1 Jul 2002 16:46:08 -0000 1.4 @@ -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. */ #ifndef IS_INVALID_CHAR @@ -10,7 +9,7 @@ #define INVALID_LEAD_CASE(n, ptr, nextTokPtr) \ case BT_LEAD ## n: \ [...1555 lines suppressed...] - const char *ptr, - const char *end, - POSITION *pos) +static void +PREFIX(updatePosition)(const ENCODING *enc, + const char *ptr, + const char *end, + POSITION *pos) { while (ptr != end) { switch (BYTE_TYPE(enc, ptr)) { @@ -1748,7 +1750,7 @@ pos->lineNumber++; ptr += MINBPC(enc); if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) - ptr += MINBPC(enc); + ptr += MINBPC(enc); pos->columnNumber = (unsigned)-1; break; default: Index: xmltok_ns.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok_ns.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xmltok_ns.c 17 May 2002 21:42:05 -0000 1.3 +++ xmltok_ns.c 1 Jul 2002 16:46:08 -0000 1.4 @@ -1,9 +1,11 @@ -const ENCODING *NS(XmlGetUtf8InternalEncoding)(void) +const ENCODING * +NS(XmlGetUtf8InternalEncoding)(void) { return &ns(internal_utf8_encoding).enc; } -const ENCODING *NS(XmlGetUtf16InternalEncoding)(void) +const ENCODING * +NS(XmlGetUtf16InternalEncoding)(void) { #if BYTEORDER == 1234 return &ns(internal_little2_encoding).enc; @@ -11,12 +13,13 @@ return &ns(internal_big2_encoding).enc; #else const short n = 1; - return *(const char *)&n ? &ns(internal_little2_encoding).enc : &ns(internal_big2_encoding).enc; + return (*(const char *)&n + ? &ns(internal_little2_encoding).enc + : &ns(internal_big2_encoding).enc); #endif } -static -const ENCODING *NS(encodings)[] = { +static const ENCODING *NS(encodings)[] = { &ns(latin1_encoding).enc, &ns(ascii_encoding).enc, &ns(utf8_encoding).enc, @@ -26,21 +29,25 @@ &ns(utf8_encoding).enc /* NO_ENC */ }; -static -int NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end, - const char **nextTokPtr) +static int +NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) { - return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_PROLOG_STATE, ptr, end, nextTokPtr); + return initScan(NS(encodings), (const INIT_ENCODING *)enc, + XML_PROLOG_STATE, ptr, end, nextTokPtr); } -static -int NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end, - const char **nextTokPtr) +static int +NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) { - return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_CONTENT_STATE, ptr, end, nextTokPtr); + return initScan(NS(encodings), (const INIT_ENCODING *)enc, + XML_CONTENT_STATE, ptr, end, nextTokPtr); } -int NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr, const char *name) +int +NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr, + const char *name) { int i = getEncodingIndex(name); if (i == UNKNOWN_ENC) @@ -54,8 +61,8 @@ return 1; } -static -const ENCODING *NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) +static const ENCODING * +NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end) { #define ENCODING_MAX 128 char buf[ENCODING_MAX]; @@ -73,26 +80,27 @@ return NS(encodings)[i]; } -int NS(XmlParseXmlDecl)(int isGeneralTextEntity, - const ENCODING *enc, - const char *ptr, - const char *end, - const char **badPtr, - const char **versionPtr, - const char **versionEndPtr, - const char **encodingName, - const ENCODING **encoding, - int *standalone) +int +NS(XmlParseXmlDecl)(int isGeneralTextEntity, + const ENCODING *enc, + const char *ptr, + const char *end, + const char **badPtr, + const char **versionPtr, + const char **versionEndPtr, + const char **encodingName, + const ENCODING **encoding, + int *standalone) { return doParseXmlDecl(NS(findEncoding), - isGeneralTextEntity, - enc, - ptr, - end, - badPtr, - versionPtr, - versionEndPtr, - encodingName, - encoding, - standalone); + isGeneralTextEntity, + enc, + ptr, + end, + badPtr, + versionPtr, + versionEndPtr, + encodingName, + encoding, + standalone); } From kwaclaw@users.sourceforge.net Mon Jul 1 10:55:46 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Mon Jul 1 09:55:46 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.46,1.47 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv12574 Modified Files: xmlparse.c Log Message: Modified fix for bug # 575168 to correct behaviour when endElementHandler was set after startElementHandler was called. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- xmlparse.c 28 Jun 2002 23:04:49 -0000 1.46 +++ xmlparse.c 1 Jul 2002 16:54:52 -0000 1.47 @@ -1724,6 +1724,8 @@ case XML_TOK_START_TAG_NO_ATTS: { TAG *tag; + enum XML_Error result; + XML_Char *toPtr; if (freeTagList) { tag = freeTagList; freeTagList = freeTagList->parent; @@ -1743,7 +1745,7 @@ tag->parent = tagStack; tagStack = tag; tag->name.localPart = NULL; - tag->name.prefix = NULL; + tag->name.prefix = NULL; tag->rawName = s + enc->minBytesPerChar; tag->rawNameLength = XmlNameLength(enc, tag->rawName); if (nextPtr) { @@ -1766,49 +1768,43 @@ tag->rawName = tag->buf; } ++tagLevel; - if (startElementHandler || endElementHandler) { - enum XML_Error result; - XML_Char *toPtr; - for (;;) { - const char *rawNameEnd = tag->rawName + tag->rawNameLength; - const char *fromPtr = tag->rawName; - int bufSize; - if (nextPtr) - toPtr = (XML_Char *)(tag->buf + ROUND_UP(tag->rawNameLength, - sizeof(XML_Char))); - else - toPtr = (XML_Char *)tag->buf; - tag->name.str = toPtr; - XmlConvert(enc, - &fromPtr, rawNameEnd, - (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - if (fromPtr == rawNameEnd) - break; - bufSize = (tag->bufEnd - tag->buf) << 1; - { - char *temp = REALLOC(tag->buf, bufSize); - if (temp == NULL) - return XML_ERROR_NO_MEMORY; - tag->buf = temp; - } - tag->bufEnd = tag->buf + bufSize; - if (nextPtr) - tag->rawName = tag->buf; + for (;;) { + const char *rawNameEnd = tag->rawName + tag->rawNameLength; + const char *fromPtr = tag->rawName; + int bufSize; + if (nextPtr) + toPtr = (XML_Char *)(tag->buf + ROUND_UP(tag->rawNameLength, + sizeof(XML_Char))); + else + toPtr = (XML_Char *)tag->buf; + tag->name.str = toPtr; + XmlConvert(enc, + &fromPtr, rawNameEnd, + (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); + if (fromPtr == rawNameEnd) + break; + bufSize = (tag->bufEnd - tag->buf) << 1; + { + char *temp = REALLOC(tag->buf, bufSize); + if (temp == NULL) + return XML_ERROR_NO_MEMORY; + tag->buf = temp; } - *toPtr = XML_T('\0'); + tag->bufEnd = tag->buf + bufSize; + if (nextPtr) + tag->rawName = tag->buf; + } + *toPtr = XML_T('\0'); + if (startElementHandler) { result = storeAtts(parser, enc, s, &(tag->name), &(tag->bindings)); if (result) return result; - if (startElementHandler) - startElementHandler(handlerArg, tag->name.str, - (const XML_Char **)atts); - poolClear(&tempPool); - } - else { - tag->name.str = NULL; - if (defaultHandler) - reportDefault(parser, enc, s, next); - } + startElementHandler(handlerArg, tag->name.str, + (const XML_Char **)atts); + } + else if (defaultHandler) + reportDefault(parser, enc, s, next); + poolClear(&tempPool); break; } case XML_TOK_EMPTY_ELEMENT_WITH_ATTS: @@ -1874,7 +1870,7 @@ return XML_ERROR_TAG_MISMATCH; } --tagLevel; - if (endElementHandler && tag->name.str) { + if (endElementHandler) { const XML_Char *localPart; const XML_Char *prefix; XML_Char *uri; From fdrake@users.sourceforge.net Mon Jul 1 14:46:11 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 1 13:46:11 2002 Subject: [Expat-checkins] expat/lib ascii.h,1.2,1.3 asciitab.h,1.2,1.3 iasciitab.h,1.2,1.3 latin1tab.h,1.2,1.3 utf8tab.h,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv32565 Modified Files: ascii.h asciitab.h iasciitab.h latin1tab.h utf8tab.h Log Message: Minor consistency nit. Index: ascii.h =================================================================== RCS file: /cvsroot/expat/expat/lib/ascii.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ascii.h 21 Sep 2000 21:20:18 -0000 1.2 +++ ascii.h 1 Jul 2002 20:44:54 -0000 1.3 @@ -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 ASCII_A 0x41 Index: asciitab.h =================================================================== RCS file: /cvsroot/expat/expat/lib/asciitab.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- asciitab.h 21 Sep 2000 21:20:18 -0000 1.2 +++ asciitab.h 1 Jul 2002 20:44:54 -0000 1.3 @@ -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. */ /* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, Index: iasciitab.h =================================================================== RCS file: /cvsroot/expat/expat/lib/iasciitab.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- iasciitab.h 21 Sep 2000 21:20:18 -0000 1.2 +++ iasciitab.h 1 Jul 2002 20:44:54 -0000 1.3 @@ -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. */ /* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */ Index: latin1tab.h =================================================================== RCS file: /cvsroot/expat/expat/lib/latin1tab.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- latin1tab.h 21 Sep 2000 21:20:18 -0000 1.2 +++ latin1tab.h 1 Jul 2002 20:44:54 -0000 1.3 @@ -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. */ /* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER, Index: utf8tab.h =================================================================== RCS file: /cvsroot/expat/expat/lib/utf8tab.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- utf8tab.h 21 Sep 2000 21:20:18 -0000 1.2 +++ utf8tab.h 1 Jul 2002 20:44:54 -0000 1.3 @@ -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. */ From kwaclaw@users.sourceforge.net Thu Jul 4 08:07:03 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Thu Jul 4 07:07:03 2002 Subject: [Expat-checkins] expat/xmlwf xmlwf.dsp,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv9466 Modified Files: xmlwf.dsp Log Message: Added COMPILED_FROM_DSP flag to make it compile under VC++. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- xmlwf.dsp 27 Jul 2001 20:26:23 -0000 1.8 +++ xmlwf.dsp 4 Jul 2002 14:06:15 -0000 1.9 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILED_FROM_DSP" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "COMPILED_FROM_DSP" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" From fdrake@users.sourceforge.net Mon Jul 8 09:33:09 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 08:33:09 2002 Subject: [Expat-checkins] htdocs/dev index.html,1.4,1.5 relreqs-1-95-4.html,1.9,1.10 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv21750 Modified Files: index.html relreqs-1-95-4.html Log Message: Clean up some markup. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.html 13 Jun 2002 20:41:24 -0000 1.4 +++ index.html 8 Jul 2002 15:32:51 -0000 1.5 @@ -21,10 +21,10 @@ Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- relreqs-1-95-4.html 29 Jun 2002 15:26:38 -0000 1.9 +++ relreqs-1-95-4.html 8 Jul 2002 15:32:51 -0000 1.10 @@ -29,17 +29,18 @@ See SF patch #559910.
Status: Done. -

+

  • SF bug #441449 should be resolved.
    Status: Done. -

    +

  • Hard tab characters will be removed from all source files. They will be replaced with spaces.
    See SF bug #570903. +

    • Delayed Requirements

    @@ -55,12 +56,13 @@ released sooner rather than being delayed by this feature. The interface for this feature is proving difficult to design, so this deserves more consideration. -

    +

  • The build process on Unix should create both libexpat.{a,so} and libexpatw.{a,so} by default. Status: Delayed: Delayed since we don't want the build process changes to hold up the release of real bug fixes. We can have another release later. +

    • Dropped Requirements

    From fdrake@users.sourceforge.net Mon Jul 8 09:34:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 08:34:05 2002 Subject: [Expat-checkins] htdocs/dev cvs.html,1.2,1.3 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv21918 Modified Files: cvs.html Log Message: Add some useful links to CVS documentation. Index: cvs.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/cvs.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cvs.html 28 Jun 2002 04:02:45 -0000 1.2 +++ cvs.html 8 Jul 2002 15:33:20 -0000 1.3 @@ -68,6 +68,27 @@ in this module. +

    CVS Documentation

    + +

    There is a variety of documentation on CVS available online. These +sources are perhaps the most useful:

    + +
      +
    • Version + Management with CVS +
      + The official manual for CVS, by Per Cederqvist and others.
      • + +
    • Open Source + Development with CVS +
      + Online version of portions of Karl Fogel's book on using CVS + for open source projects.
      • + +
    • CVS Documentation +
      + A list of available documentation on CVS.
      • + From fdrake@users.sourceforge.net Mon Jul 8 09:35:02 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 08:35:02 2002 Subject: [Expat-checkins] htdocs style.css,1.3,1.4 Message-ID: Update of /cvsroot/expat/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv22235 Modified Files: style.css Log Message: Remove the need to use

      to add space between list items. Index: style.css =================================================================== RCS file: /cvsroot/expat/htdocs/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- style.css 13 Jun 2002 20:44:20 -0000 1.3 +++ style.css 8 Jul 2002 15:34:04 -0000 1.4 @@ -21,4 +21,9 @@ margin: 0em; border-width: 0px; vertical-align: baseline; - border-bottom: 2px solid rgb(110,139,61); } + border-bottom: 2px solid rgb(110,139,61); + } + +.content li { margin: 0em; + padding-bottom: 0.75em; + } From fdrake@users.sourceforge.net Mon Jul 8 10:03:10 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 09:03:10 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-5.html,NONE,1.1 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv31158 Added Files: relreqs-1-95-5.html Log Message: Release requirements for 1.95.5. --- NEW FILE: relreqs-1-95-5.html --- Expat 1.95.5 Requirements

      The following are the currently-planned release requirements for Expat 1.95.5. Items will not be removed from this page; if a requirement is dropped or delayed, it will be moved to the appropriate section at the end and the reason for the change will be noted.

      Expat 1.95.5 Requirements

      • The InternalEntityRefHandler feature needs to be implemented and tested.
        See the comments for SF patch #429501.
      • The build process on Unix should create both libexpat.{a,so} and libexpatw.{a,so} by default.

      Delayed Requirements

      There are no delayed requirements at this time.

      Dropped Requirements

      There are no dropped requirements at this time.
      SourceForge Logo
      From fdrake@users.sourceforge.net Mon Jul 8 10:04:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 09:04:03 2002 Subject: [Expat-checkins] htdocs/dev index.html,1.5,1.6 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv31490 Modified Files: index.html Log Message: Add link to the next set of release requirements as well. Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- index.html 8 Jul 2002 15:32:51 -0000 1.5 +++ index.html 8 Jul 2002 16:03:16 -0000 1.6 @@ -20,7 +20,11 @@

      • Requirements for the next - release.
        • + release (1.95.4). +
        + Other releases: + 1.95.5 +
      • CVS instructions for developers and occasional contributors.
        • From fdrake@users.sourceforge.net Mon Jul 8 11:07:10 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 10:07:10 2002 Subject: [Expat-checkins] expat/lib macconfig.h,NONE,1.1 Makefile.MPW,NONE,1.1 xmlrole.c,1.9,1.10 xmltok.c,1.18,1.19 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv20265/lib Modified Files: xmlrole.c xmltok.c Added Files: macconfig.h Makefile.MPW Log Message: Mac OS (classic) support, based on patches from Thomas Wegner and Daryle Walker. --- NEW FILE: macconfig.h --- /*================================================================ ** Copyright 2000, Clark Cooper ** All rights reserved. ** ** This is free software. You are permitted to copy, distribute, or modify ** it under the terms of the MIT/X license (contained in the COPYING file ** with this distribution.) ** */ #ifndef MACCONFIG_H #define MACCONFIG_H /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ #define BYTEORDER 4321 /* Define to 1 if you have the `bcopy' function. */ #undef HAVE_BCOPY /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #define HAVE_STRING_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ #undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS /* whether byteorder is bigendian */ #define WORDS_BIGENDIAN /* Define to specify how much context to retain around the current parse point. */ #undef XML_CONTEXT_BYTES /* Define to make parameter entity parsing functionality available. */ #define XML_DTD /* Define to make XML Namespaces functionality available. */ #define XML_NS /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define to `long' if does not define. */ #define off_t long /* Define to `unsigned' if does not define. */ #undef size_t #endif /* ifndef MACCONFIG_H */ --- NEW FILE: Makefile.MPW --- # File: Makefile.MPW # Targets: All, Dynamic, Static (and Clean, Clean-All) # Created: Tuesday, July 02, 2002 # # MPW Makefile for building expat under the "classic" (i.e. pre-X) Mac OS # Copyright © 2002 Daryle Walker # Portions Copyright © 2002 Thomas Wegner # See the COPYING file for distribution information # # Description: # This Makefile lets you build static, dynamic (i.e. shared) and stub # versions of the expat library as well as the elements.c and outline.c # examples (built as tools for MPW). This is for PPC only; it should be # no problem to build a 68K version of the expat library, though. # # Usage: # Buildprogram All # or Buildprogram Dynamic # or Buildprogram Static # # Note: You first have to rename this file to "Makefile", or the Buildprogram # commando will not recognize it. # MAKEFILE = Makefile ¥MondoBuild¥ = {MAKEFILE} # Make blank to avoid rebuilds when makefile is modified ObjDir = : SrcDir = : HdrDir = : ToolDir = ::examples: Includes = -i {HdrDir} Sym-PPC = -sym off Defines = -d MACOS_CLASSIC PPCCOptions = {Includes} {Sym-PPC} -w 35 {Defines} FragName = libexpat ### Source Files ### SrcFiles = ¶ "{SrcDir}xmlparse.c" ¶ "{SrcDir}xmlrole.c" ¶ "{SrcDir}xmltok.c" ToolSrcFiles = ¶ "{ToolDir}elements.c" ¶ "{ToolDir}outline.c" ### Object Files ### ObjFiles-PPC = ¶ "{ObjDir}xmlparse.c.o" ¶ "{ObjDir}xmlrole.c.o" ¶ "{ObjDir}xmltok.c.o" ElementToolObjFile = "{ObjDir}elements.c.o" OutlineToolObjFile = "{ObjDir}outline.c.o" ### Libraries ### StLibFiles-PPC = ¶ "{PPCLibraries}StdCRuntime.o" ¶ "{PPCLibraries}PPCCRuntime.o" ¶ "{PPCLibraries}PPCToolLibs.o" ShLibFiles-PPC = ¶ "{SharedLibraries}InterfaceLib" ¶ "{SharedLibraries}StdCLib" ¶ "{SharedLibraries}MathLib" LibFiles-PPC = ¶ {StLibFiles-PPC} ¶ {ShLibFiles-PPC} ### Special Files ### ExportFile = "{ObjDir}{FragName}.exp" StLibFile = "{ObjDir}{FragName}.MrC.o" ShLibFile = "{ObjDir}{FragName}" StubFile = "{ObjDir}{FragName}.stub" ElementsTool = "{ToolDir}elements" OutlineTool = "{ToolDir}outline" ### Default Rules ### .c.o Ä .c {¥MondoBuild¥} {PPCC} {depDir}{default}.c -o {targDir}{default}.c.o {PPCCOptions} ### Build Rules ### All Ä Dynamic {ElementsTool} {OutlineTool} Static Ä {StLibFile} Dynamic Ä Static {ShLibFile} {StubFile} {StLibFile} ÄÄ {ObjFiles-PPC} {StLibFiles-PPC} {¥MondoBuild¥} PPCLink ¶ -o {Targ} ¶ {ObjFiles-PPC} ¶ {StLibFiles-PPC} ¶ {Sym-PPC} ¶ -mf -d ¶ -t 'XCOF' ¶ -c 'MPS ' ¶ -xm l {ShLibFile} ÄÄ {StLibFile} {ShLibFiles-PPC} {ExportFile} {¥MondoBuild¥} PPCLink ¶ -o {Targ} ¶ {StLibFile} ¶ {ShLibFiles-PPC} ¶ {Sym-PPC} ¶ -@export {ExportFile} ¶ -fragname {FragName} ¶ -mf -d ¶ -t 'shlb' ¶ -c '????' ¶ -xm s {StubFile} ÄÄ {ShLibFile} {¥MondoBuild¥} shlb2stub -o {Targ} {ShLibFile} {ElementsTool} ÄÄ {ElementToolObjFile} {StubFile} {LibFiles-PPC} {¥MondoBuild¥} PPCLink ¶ -o {Targ} ¶ {ElementToolObjFile} ¶ {StLibFile} ¶ {LibFiles-PPC} ¶ {Sym-PPC} ¶ -mf -d ¶ -t 'MPST' ¶ -c 'MPS ' {OutlineTool} ÄÄ {OutlineToolObjFile} {StubFile} {LibFiles-PPC} {¥MondoBuild¥} PPCLink ¶ -o {Targ} ¶ {OutlineToolObjFile} ¶ {StLibFile} ¶ {LibFiles-PPC} ¶ {Sym-PPC} ¶ -mf -d ¶ -t 'MPST' ¶ -c 'MPS ' ### Special Rules ### {ExportFile} ÄÄ "{HdrDir}expat.h" {¥MondoBuild¥} StreamEdit -d ¶ -e "/¥('XMLPARSEAPI('Å') ')Ç0,1È'XML_'([A-Za-z0-9_]+)¨1'('/ Print 'XML_' ¨1" ¶ "{HdrDir}expat.h" > {Targ} ### Required Dependencies ### "{ObjDir}xmlparse.c.o" Ä "{SrcDir}xmlparse.c" "{ObjDir}xmlrole.c.o" Ä "{SrcDir}xmlrole.c" "{ObjDir}xmltok.c.o" Ä "{SrcDir}xmltok.c" "{ObjDir}elements.c.o" Ä "{ToolDir}elements.c" "{ObjDir}outline.c.o" Ä "{ToolDir}outline.c" ### Optional Dependencies ### ### Build this target to clean out generated intermediate files. ### Clean Ä Delete {ObjFiles-PPC} {ExportFile} {ElementToolObjFile} {OutlineToolObjFile} ### Build this target to clean out all generated files. ### Clean-All Ä Clean Delete {StLibFile} {ShLibFile} {StubFile} {ElementsTool} {OutlineTool} ### Build this target to generate "include file" dependencies. ### Dependencies Ä $OutOfDate MakeDepend ¶ -append {MAKEFILE} ¶ -ignore "{CIncludes}" ¶ -objdir "{ObjDir}" ¶ -objext .o ¶ {Defines} ¶ {Includes} ¶ {SrcFiles} Index: xmlrole.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- xmlrole.c 1 Jul 2002 16:45:37 -0000 1.9 +++ xmlrole.c 8 Jul 2002 17:06:55 -0000 1.10 @@ -4,6 +4,8 @@ #ifdef COMPILED_FROM_DSP #include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#include "macconfig.h" #else #include #endif /* ndef COMPILED_FROM_DSP */ Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- xmltok.c 1 Jul 2002 16:46:06 -0000 1.18 +++ xmltok.c 8 Jul 2002 17:06:55 -0000 1.19 @@ -4,6 +4,8 @@ #ifdef COMPILED_FROM_DSP #include "winconfig.h" +#elif defined(MACOS_CLASSIC) +#incldue "macconfig.h" #else #include #endif /* ndef COMPILED_FROM_DSP */ From fdrake@users.sourceforge.net Mon Jul 8 11:09:07 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 10:09:07 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.47,1.48 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv20791/lib Modified Files: xmlparse.c Log Message: Mac OS (classic) support, based on patches from Thomas Wegner and Daryle Walker. Also moved some #include statements around and removed a VMS-specific #include that duplicates an existing #include. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- xmlparse.c 1 Jul 2002 16:54:52 -0000 1.47 +++ xmlparse.c 8 Jul 2002 17:08:45 -0000 1.48 @@ -2,9 +2,8 @@ See the file COPYING for copying permission. */ -#ifdef __VMS -#include /* memset(), memcpy() */ -#endif +#include +#include /* memset(), memcpy() */ #ifdef COMPILED_FROM_DSP @@ -13,6 +12,11 @@ #include "expat.h" #undef XMLPARSEAPI +#elif defined(MACOS_CLASSIC) + +#include "macconfig.h" +#include "expat.h" + #else #include @@ -27,9 +31,6 @@ #undef XMLPARSEAPI #endif #endif /* ndef COMPILED_FROM_DSP */ - -#include -#include #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX From fdrake@users.sourceforge.net Mon Jul 8 11:11:09 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Mon Jul 8 10:11:09 2002 Subject: [Expat-checkins] expat Changes,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv21294 Modified Files: Changes Log Message: Added note about Mac OS classic support. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Changes 5 Jun 2002 04:16:29 -0000 1.14 +++ Changes 8 Jul 2002 17:10:38 -0000 1.15 @@ -1,6 +1,8 @@ Release 1.95.4 (eventually) - Added support for VMS, contributed by Craig Berry. See vms/README.vms for more information. + - Added Mac OS (classic) support, with a makefile for MPW, + contributed by Thomas Wegner and Daryle Walker. Release 1.95.3 Mon Jun 3 2002 - Added a project to the MSVC workspace to create a wchar_t From fdrake@users.sourceforge.net Tue Jul 9 07:58:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 06:58:04 2002 Subject: [Expat-checkins] expat/lib xmltok.c,1.19,1.20 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv20247 Modified Files: xmltok.c Log Message: Fix typo from manual application of the Mac OS classic patch. Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- xmltok.c 8 Jul 2002 17:06:55 -0000 1.19 +++ xmltok.c 9 Jul 2002 13:57:18 -0000 1.20 @@ -5,7 +5,7 @@ #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) -#incldue "macconfig.h" +#include "macconfig.h" #else #include #endif /* ndef COMPILED_FROM_DSP */ From kwaclaw@users.sourceforge.net Tue Jul 9 12:30:02 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Tue Jul 9 11:30:02 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.48,1.49 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv7988 Modified Files: xmlparse.c Log Message: Fix for bug #579196. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- xmlparse.c 8 Jul 2002 17:08:45 -0000 1.48 +++ xmlparse.c 9 Jul 2002 18:29:23 -0000 1.49 @@ -3553,6 +3553,8 @@ if (dtd.in_eldecl) { ELEMENT_TYPE *el; + const XML_Char *name; + int nameLen; const char *nxt = quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar; int myindex = nextScaffoldPart(parser); if (myindex < 0) @@ -3562,8 +3564,11 @@ el = getElementType(parser, enc, s, nxt); if (! el) return XML_ERROR_NO_MEMORY; - dtd.scaffold[myindex].name = el->name; - dtd.contentStringLen += nxt - s + 1; + name = el->name; + dtd.scaffold[myindex].name = name; + nameLen = 0; + for (; name[nameLen++]; ); + dtd.contentStringLen += nameLen; } break; From fdrake@users.sourceforge.net Tue Jul 9 12:38:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 11:38:04 2002 Subject: [Expat-checkins] expat Changes,1.15,1.16 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv9977 Modified Files: Changes Log Message: Add a list of bugs fixed for 1.95.4 so far. Set a target release date. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Changes 8 Jul 2002 17:10:38 -0000 1.15 +++ Changes 9 Jul 2002 18:37:32 -0000 1.16 @@ -1,8 +1,10 @@ -Release 1.95.4 (eventually) +Release 1.95.4 Fri Jul 12 2002 - Added support for VMS, contributed by Craig Berry. See vms/README.vms for more information. - Added Mac OS (classic) support, with a makefile for MPW, contributed by Thomas Wegner and Daryle Walker. + - Fixed a variety of bugs: see SF bug reports 441449, 563184, + 564342, 566334, 575168, 579196. Release 1.95.3 Mon Jun 3 2002 - Added a project to the MSVC workspace to create a wchar_t From fdrake@users.sourceforge.net Tue Jul 9 14:26:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 13:26:05 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.49,1.50 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv10098 Modified Files: xmlparse.c Log Message: A variety of code-style changes: - Use only plain spaces, no hard tabs. - Strip trailing whitespace from all lines. - Strip blank line from the end of the file. - Do no use a space following the ! operator. - Wrap a couple of long lines. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- xmlparse.c 9 Jul 2002 18:29:23 -0000 1.49 +++ xmlparse.c 9 Jul 2002 20:25:10 -0000 1.50 @@ -61,7 +61,7 @@ #endif -#ifdef XML_UNICODE +#ifdef XML_UNICODE #ifdef XML_UNICODE_WCHAR_T #define XML_T(x) (const wchar_t)x @@ -70,11 +70,11 @@ #define XML_T(x) (const unsigned short)x #define XML_L(x) x [...4258 lines suppressed...] + const char *ptr, + const char *end) { const XML_Char *name = poolStoreString(&dtd.pool, enc, ptr, end); ELEMENT_TYPE *ret; - if (! name) + if (!name) return 0; ret = (ELEMENT_TYPE *) lookup(&dtd.elementTypes, name, sizeof(ELEMENT_TYPE)); - if (! ret) + if (!ret) return 0; if (ret->name != name) poolDiscard(&dtd.pool); @@ -5108,4 +5111,3 @@ } return ret; } /* End getElementType */ - From fdrake@users.sourceforge.net Tue Jul 9 14:50:04 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 13:50:04 2002 Subject: [Expat-checkins] expat README,1.17,1.18 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv17397 Modified Files: README Log Message: Bump version number & de-tabify. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- README 4 Jun 2002 16:35:21 -0000 1.17 +++ README 9 Jul 2002 20:49:47 -0000 1.18 @@ -1,5 +1,5 @@ - Expat, Release 1.95.3 + Expat, Release 1.95.4 This is expat, a C library for parsing XML, written by James Clark. Expat is a stream-oriented XML parser. This means that you register @@ -25,7 +25,7 @@ To build expat, you first run the configuration shell script in the top level distribution directory: - ./configure + ./configure There are many options which you may provide to configure (which you can discover by running configure with the --help option). But the @@ -36,7 +36,7 @@ into /home/me/mystuff/lib, /home/me/mystuff/include, and /home/me/mystuff/bin, you can tell configure about that with: - ./configure --prefix=/home/me/mystuff + ./configure --prefix=/home/me/mystuff After running the configure script, the "make" command will build things and "make install" will install things into their proper @@ -47,30 +47,30 @@ information in UTF-16 rather than the default UTF-8, following these instructions: - 1. For UTF-16 output as unsigned short (and version/error - strings as char), run: + 1. For UTF-16 output as unsigned short (and version/error + strings as char), run: - ./configure CPPFLAGS=-DXML_UNICODE + ./configure CPPFLAGS=-DXML_UNICODE - For UTF-16 output as wchar_t (incl. version/error strings), - run: + For UTF-16 output as wchar_t (incl. version/error strings), + run: - ./configure CFLAGS="-g -O2 -fshort-wchar" \ - CPPFLAGS=-DXML_UNICODE_WCHAR_T + ./configure CFLAGS="-g -O2 -fshort-wchar" \ + CPPFLAGS=-DXML_UNICODE_WCHAR_T - 2. Edit the MakeFile, changing: + 2. Edit the MakeFile, changing: - LIBRARY = libexpat.la + LIBRARY = libexpat.la - to: + to: - LIBRARY = libexpatw.la + LIBRARY = libexpatw.la - (Note the additional "w" in the library name.) + (Note the additional "w" in the library name.) - 3. Run "make buildlib" (which builds the library only). + 3. Run "make buildlib" (which builds the library only). - 4. Run "make installlib" (which installs the library only). + 4. Run "make installlib" (which installs the library only). Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to @@ -79,7 +79,7 @@ properly -- appearantly it does not understand .PHONY directives). If you're using ksh or bash, use this command to build: - PATH=/usr/ccs/bin:$PATH make + PATH=/usr/ccs/bin:$PATH make When using Expat with a project using autoconf for configuration, you can use the probing macro in conftools/expat.m4 to determine how to @@ -98,4 +98,4 @@ place on expat-discuss@lists.sourceforge.net. Archives of this list may be found at: - http://sourceforge.net/mailarchive/forum.php?forum_id=6385 + http://sourceforge.net/mailarchive/forum.php?forum_id=6385 From fdrake@users.sourceforge.net Tue Jul 9 14:51:03 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 13:51:03 2002 Subject: [Expat-checkins] expat/tests README.txt,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv17484/tests Modified Files: README.txt Log Message: De-tabify. Index: README.txt =================================================================== RCS file: /cvsroot/expat/expat/tests/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README.txt 13 Nov 2001 05:04:51 -0000 1.2 +++ README.txt 9 Jul 2002 20:50:04 -0000 1.3 @@ -6,7 +6,7 @@ The Expat tests use the "Check" unit testing framework for C. More information on Check can be found at: - http://check.sourceforge.net/ + http://check.sourceforge.net/ Check 0.8 must be installed before the unit tests can be compiled & run. From fdrake@users.sourceforge.net Tue Jul 9 14:56:05 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 13:56:05 2002 Subject: [Expat-checkins] htdocs/dev relreqs-1-95-4.html,1.10,1.11 Message-ID: Update of /cvsroot/expat/htdocs/dev In directory usw-pr-cvs1:/tmp/cvs-serv18953 Modified Files: relreqs-1-95-4.html Log Message: Marked the de-tabification task complete. Index: relreqs-1-95-4.html =================================================================== RCS file: /cvsroot/expat/htdocs/dev/relreqs-1-95-4.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- relreqs-1-95-4.html 8 Jul 2002 15:32:51 -0000 1.10 +++ relreqs-1-95-4.html 9 Jul 2002 20:55:07 -0000 1.11 @@ -39,7 +39,8 @@ They will be replaced with spaces.
        See SF bug #570903. + >SF bug #570903.
        + Status: Done.
      From kwaclaw@users.sourceforge.net Tue Jul 9 14:59:03 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Tue Jul 9 13:59:03 2002 Subject: [Expat-checkins] expat/lib xmlparse.c,1.50,1.51 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv19827 Modified Files: xmlparse.c Log Message: Applied modified version of patch #578161. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- xmlparse.c 9 Jul 2002 20:25:10 -0000 1.50 +++ xmlparse.c 9 Jul 2002 20:58:04 -0000 1.51 @@ -163,6 +163,7 @@ const XML_Char *notation; char open; char is_param; + char is_internal; /* true if declared in internal subset outside of any PE */ } ENTITY; typedef struct { @@ -223,14 +224,19 @@ HASH_TABLE prefixes; STRING_POOL pool; STRING_POOL entityValuePool; [...997 lines suppressed...] + newE->is_param = oldE->is_param; + newE->is_internal = oldE->is_internal; } return 1; } @@ -5074,8 +5165,7 @@ XML_Content *ret; XML_Content *cpos; XML_Char * str; - int allocsize = (dtd.scaffCount * sizeof(XML_Content) - + (dtd.contentStringLen * sizeof(XML_Char))); + int allocsize = dtd.scaffCount * sizeof(XML_Content) + (dtd.contentStringLen * sizeof(XML_Char)); ret = MALLOC(allocsize); if (!ret) @@ -5111,3 +5201,4 @@ } return ret; } /* End getElementType */ + From kwaclaw@users.sourceforge.net Tue Jul 9 14:59:05 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Tue Jul 9 13:59:05 2002 Subject: [Expat-checkins] expat/lib expat.h,1.26,1.27 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv19902 Modified Files: expat.h Log Message: Applied modified version of patch #578161. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- expat.h 1 Jul 2002 16:46:05 -0000 1.26 +++ expat.h 9 Jul 2002 20:58:17 -0000 1.27 @@ -371,6 +371,10 @@ has been read *and* this is not an error. 2) An internal entity reference is read, but not expanded, because XML_SetDefaultHandler has been called. + Note: skipped parameter entities in declarations and skipped general + entities in attribute values cannot be reported, because + the event would be out of sync with the reporting of the + declarations or attribute values */ typedef void (*XML_SkippedEntityHandler)(void *userData, const XML_Char *entityName, @@ -725,7 +729,8 @@ XML_ERROR_UNCLOSED_CDATA_SECTION, XML_ERROR_EXTERNAL_ENTITY_HANDLING, XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE + XML_ERROR_UNEXPECTED_STATE, + XML_ERROR_ENTITY_DECLARED_IN_PE }; /* If XML_Parse or XML_ParseBuffer have returned 0, then From fdrake@users.sourceforge.net Tue Jul 9 15:18:08 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 14:18:08 2002 Subject: [Expat-checkins] expat/tests runtests.c,1.23,1.24 Message-ID: Update of /cvsroot/expat/expat/tests In directory usw-pr-cvs1:/tmp/cvs-serv25451 Modified Files: runtests.c Log Message: Add a test for SF bug #478332. If I understand the report correctly, I can't reproduce the bug using the CVS version of Expat. Index: runtests.c =================================================================== RCS file: /cvsroot/expat/expat/tests/runtests.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- runtests.c 28 Jun 2002 23:04:49 -0000 1.23 +++ runtests.c 9 Jul 2002 21:17:45 -0000 1.24 @@ -284,6 +284,41 @@ } END_TEST +/* Regression test for SF bug #478332. */ +START_TEST(test_really_long_lines) +{ + /* This parses an input line longer than INIT_DATA_BUF_SIZE + characters long (defined to be 1024 in xmlparse.c). We take a + really cheesy approach to building the input buffer, because + this avoids writing bugs in buffer-filling code. + */ + char *text = + "" + /* 64 chars */ + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + /* until we have at least 1024 characters on the line: */ + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+" + ""; + if (!XML_Parse(parser, text, strlen(text), 1)) + xml_failure(parser); +} +END_TEST + /* * Element event tests. @@ -626,6 +661,7 @@ tcase_add_test(tc_chars, test_french_latin1); tcase_add_test(tc_chars, test_french_utf8); tcase_add_test(tc_chars, test_line_count); + tcase_add_test(tc_chars, test_really_long_lines); suite_add_tcase(s, tc_elements); tcase_add_checked_fixture(tc_elements, basic_setup, basic_teardown); From kwaclaw@users.sourceforge.net Tue Jul 9 15:20:03 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Tue Jul 9 14:20:03 2002 Subject: [Expat-checkins] expat Changes,1.16,1.17 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv25930 Modified Files: Changes Log Message: Added to list of changes for 1.95.4. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Changes 9 Jul 2002 18:37:32 -0000 1.16 +++ Changes 9 Jul 2002 21:19:24 -0000 1.17 @@ -5,6 +5,12 @@ contributed by Thomas Wegner and Daryle Walker. - Fixed a variety of bugs: see SF bug reports 441449, 563184, 564342, 566334, 575168, 579196. + - Made skippedEntityHandler conform to SAX2 (see source comment) + - Re-implemented WFC: Entity Declared from XML 1.0 spec and + added a new error "entity declared in parameter entity": + see SF bug report 569461 and SF patch 578161 + - Re-implemented section 5.1 from XML 1.0 spec: + see SF bug report 570263 and SF patch 578161 Release 1.95.3 Mon Jun 3 2002 - Added a project to the MSVC workspace to create a wchar_t From fdrake@users.sourceforge.net Tue Jul 9 15:29:29 2002 From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net) Date: Tue Jul 9 14:29:29 2002 Subject: [Expat-checkins] expat Changes,1.17,1.18 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv28646 Modified Files: Changes Log Message: Add a couple more fixed bugs to the list. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Changes 9 Jul 2002 21:19:24 -0000 1.17 +++ Changes 9 Jul 2002 21:28:44 -0000 1.18 @@ -4,7 +4,7 @@ - Added Mac OS (classic) support, with a makefile for MPW, contributed by Thomas Wegner and Daryle Walker. - Fixed a variety of bugs: see SF bug reports 441449, 563184, - 564342, 566334, 575168, 579196. + 564342, 566334, 569461, 570263, 575168, 579196. - Made skippedEntityHandler conform to SAX2 (see source comment) - Re-implemented WFC: Entity Declared from XML 1.0 spec and added a new error "entity declared in parameter entity": From kwaclaw@users.sourceforge.net Wed Jul 10 21:36:01 2002 From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net) Date: Wed Jul 10 20:36:01 2002 Subject: [Expat-checkins] expat/doc reference.html,1.12,1.13 Message-ID: Update of /cvsroot/expat/expat/doc In directory usw-pr-cvs1:/tmp/cvs-serv28593 Modified Files: reference.html Log Message: Added documentation for new skipped entity handler. Index: reference.html =================================================================== RCS file: /cvsroot/expat/expat/doc/reference.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- reference.html 13 Jun 2002 18:12:20 -0000 1.12 +++ reference.html 11 Jul 2002 03:35:42 -0000 1.13 @@ -61,9 +61,9 @@
    • Handler Setting Functions
        -
      • XML_SetStartElementHandler
        • +
      • XML_SetStartElementHandler
      • XML_SetEndElementHandler
        • -
      • XML_SetElementHandler
        • +
      • XML_SetElementHandler
      • XML_SetCharacterDataHandler
      • XML_SetProcessingInstructionHandler
      • XML_SetCommentHandler
        • @@ -73,6 +73,7 @@
      • XML_SetDefaultHandler
      • XML_SetDefaultHandlerExpand
      • XML_SetExternalEntityRefHandler
        • +
      • XML_SetSkippedEntityHandler
      • XML_SetUnknownEncodingHandler
      • XML_SetStartNamespaceDeclHandler
      • XML_SetEndNamespaceDeclHandler
        • @@ -91,7 +92,7 @@
      • Parse Position and Error Reporting Functions
          -
        • XML_GetErrorCode
          • +
        • XML_GetErrorCode
        • XML_ErrorString
        • XML_GetCurrentByteIndex
        • XML_GetCurrentLineNumber
          • @@ -102,7 +103,7 @@
        • Miscellaneous Functions
            -
          • XML_SetUserData
            • +
          • XML_SetUserData
          • XML_GetUserData
          • XML_UseParserAsHandlerArg
          • XML_SetBase
            • @@ -932,10 +933,36 @@
            +
            +XML_SetSkippedEntityHandler(XML_Parser p,
+                            XML_SkippedEntityHandler handler)
+
            +
            +typedef void
+(*XML_SkippedEntityHandler)(void *userData,
+                            const XML_Char *entityName,
+                            int is_parameter_entity);
+
            +

            Set a skipped entity handler. This is called in two situations:

            +
              +
            1. An entity reference is encountered for which no declaration + has been read *and* this is not an error.
              2. +
            2. An internal entity reference is read, but not expanded, because + XML_SetDefaultHandler + has been called.
              3. +
            +

            The is_parameter_entity argument will be non-zero for +a parameter entity and zero for a general entity.

            +

            Note: skipped parameter entities in declarations and skipped general +entities in attribute values cannot be reported, because the event would +be out of sync with the reporting of the declarations or attribute values

            +
            + +
             XML_SetUnknownEncodingHandler(XML_Parser p,
                               XML_UnknownEncodingHandler enchandler,
-			      void *encodingHandlerData)
+			                  void *encodingHandlerData)
 
             typedef int




From fdrake@users.sourceforge.net  Thu Jul 11 12:55:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 11:55:05 2002
Subject: [Expat-checkins] expat Makefile.in,1.36,1.37
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv11877

Modified Files:
	Makefile.in 
Log Message:
Fix installation when building from outside the source directory.
Closes SF patch #566901.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.in	3 Jun 2002 18:16:07 -0000	1.36
+++ Makefile.in	11 Jul 2002 18:54:42 -0000	1.37
@@ -40,15 +40,16 @@
 INSTALL_DATA = @INSTALL_DATA@
 mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
-APIHEADER = expat.h
+MANFILE = $(srcdir)/doc/xmlwf.1
+APIHEADER = $(srcdir)/lib/expat.h
 LIBRARY = libexpat.la
 
 
 default:  buildlib xmlwf/xmlwf
 
-buildlib: lib/$(LIBRARY)
+buildlib: $(LIBRARY)
 
-all: lib/$(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
 
 clean:
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
@@ -70,12 +71,12 @@
 install: xmlwf/xmlwf installlib
 	$(mkinstalldirs) $(bindir) $(mandir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-	$(INSTALL_DATA) doc/xmlwf.1 $(mandir)
+	$(INSTALL_DATA) $(MANFILE) $(mandir)
 
-installlib: lib/$(LIBRARY) lib/$(APIHEADER)
+installlib: $(LIBRARY) $(APIHEADER)
 	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) lib/$(APIHEADER) $(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
+	$(INSTALL_DATA) $(APIHEADER) $(includedir)
 
 uninstall: uninstalllib
 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
@@ -94,7 +95,7 @@
 CC = @CC@
 LIBTOOL = @LIBTOOL@
 
-INCLUDES = -Ilib -I.
+INCLUDES = -I$(srcdir)/lib -I.
 LDFLAGS = @LDFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
@@ -109,7 +110,7 @@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
-lib/$(LIBRARY): $(LIB_OBJS)
+$(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
 
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
@@ -129,20 +130,20 @@
 xmlwf/xmlfile.o: xmlwf/xmlfile.c
 xmlwf/codepage.o: xmlwf/codepage.c
 xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c
-xmlwf/xmlwf: $(XMLWF_OBJS) lib/$(LIBRARY)
-	$(LINK_EXE) $(XMLWF_OBJS) lib/$(LIBRARY)
+xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY)
+	$(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY)
 
 examples/elements.o: examples/elements.c
-examples/elements: examples/elements.o lib/$(LIBRARY)
-	$(LINK_EXE) $< lib/$(LIBRARY)
+examples/elements: examples/elements.o $(LIBRARY)
+	$(LINK_EXE) $< $(LIBRARY)
 
 examples/outline.o: examples/outline.c
-examples/outline: examples/outline.o lib/$(LIBRARY)
-	$(LINK_EXE) $< lib/$(LIBRARY)
+examples/outline: examples/outline.o $(LIBRARY)
+	$(LINK_EXE) $< $(LIBRARY)
 
 tests/chardata.o: tests/chardata.c tests/chardata.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o lib/$(LIBRARY)
+tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY)
 	$(LINK_EXE) $^ -lcheck
 
 tests/xmltest.zip:




From fdrake@users.sourceforge.net  Thu Jul 11 12:56:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 11:56:05 2002
Subject: [Expat-checkins] expat .cvsignore,1.8,1.9
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv12226

Modified Files:
	.cvsignore 
Log Message:
Update lists of ignored files to match changes from Makefile.in 1.37.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- .cvsignore	17 May 2002 21:35:12 -0000	1.8
+++ .cvsignore	11 Jul 2002 18:55:43 -0000	1.9
@@ -1,4 +1,6 @@
 Makefile
+.libs
+*.la
 configure
 config.cache
 config.log




From fdrake@users.sourceforge.net  Thu Jul 11 12:56:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 11:56:05 2002
Subject: [Expat-checkins] expat/lib .cvsignore,1.4,1.5
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv12226/lib

Modified Files:
	.cvsignore 
Log Message:
Update lists of ignored files to match changes from Makefile.in 1.37.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/lib/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	31 May 2002 03:12:47 -0000	1.4
+++ .cvsignore	11 Jul 2002 18:55:43 -0000	1.5
@@ -1,7 +1,6 @@
 Makefile
 .libs
 *.lo
-*.la
 expat.h
 Debug
 Debug-w




From fdrake@users.sourceforge.net  Thu Jul 11 20:42:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 19:42:03 2002
Subject: [Expat-checkins] expat/bcb5 - New directory
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv9249/bcb5

Log Message:
Directory /cvsroot/expat/expat/bcb5 added to the repository





From fdrake@users.sourceforge.net  Thu Jul 11 20:47:02 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 19:47:02 2002
Subject: [Expat-checkins] expat/bcb5 ExpatGroup.bpg,NONE,1.1 elements.bpf,NONE,1.1 elements.bpr,NONE,1.1 elements.mak,NONE,1.1 expat.bpf,NONE,1.1 expat.bpr,NONE,1.1 expat.mak,NONE,1.1 expatw.bpf,NONE,1.1 expatw.bpr,NONE,1.1 expatw.mak,NONE,1.1 gennmtab.bpf,NONE,1.1 gennmtab.bpr,NONE,1.1 gennmtab.mak,NONE,1.1 makefile.mak,NONE,1.1 outline.bpf,NONE,1.1 outline.bpr,NONE,1.1 outline.mak,NONE,1.1 setup.bat,NONE,1.1 xmlwf.bpf,NONE,1.1 xmlwf.bpr,NONE,1.1 xmlwf.mak,NONE,1.1
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv9966

Added Files:
	ExpatGroup.bpg elements.bpf elements.bpr elements.mak 
	expat.bpf expat.bpr expat.mak expatw.bpf expatw.bpr expatw.mak 
	gennmtab.bpf gennmtab.bpr gennmtab.mak makefile.mak 
	outline.bpf outline.bpr outline.mak setup.bat xmlwf.bpf 
	xmlwf.bpr xmlwf.mak 
Log Message:
Support files for Borland C++ Builder 5 / BCC 5.5.
Contributed by Patrick McConnell.
Closes SF patch #538032.


--- NEW FILE: ExpatGroup.bpg ---
#------------------------------------------------------------------------------
VERSION = BWS.01
#------------------------------------------------------------------------------
!ifndef ROOT
ROOT = $(MAKEDIR)\..
!endif
#------------------------------------------------------------------------------
MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
PROJECTS = setup expat.dll expatw.dll elements.exe outline.exe gennmtab.exe \
  xmlwf.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------

elements.exe: elements.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

expat.dll: expat.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

expatw.dll: expatw.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

outline.exe: outline.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

xmlwf.exe: xmlwf.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

setup: setup.bat
  call $**

gennmtab.exe: gennmtab.bpr
  $(ROOT)\bin\bpr2mak $**
  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak



--- NEW FILE: elements.bpf ---
USEUNIT("..\Source\examples\elements.c");
//---------------------------------------------------------------------------
#define WinMain

--- NEW FILE: elements.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=7
Item0=$(BCB)\include;..\Source\examples;..\Source\lib
Item1=..\Source\examples;..\examples;$(BCB)\include;..\lib
Item2=..\examples;$(BCB)\include;..\lib
Item3=..\..\..\examples;$(BCB)\include;..\..\..\lib
Item4=..\..\..\examples;$(BCB)\include
Item5=$(BCB)\include
Item6=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=$(BCB)\lib;..\Source\examples;debug
Item1=..\Source\examples;$(BCB)\lib;debug
Item2=..\Source\examples;$(BCB)\lib;.\debug
Item3=..\Source\examples;..\examples;$(BCB)\lib;..\lib\release
Item4=..\examples;$(BCB)\lib;..\lib\release
Item5=..\..\..\examples;$(BCB)\lib;..\..\..\lib\release
Item6=..\..\..\examples;$(BCB)\lib;..\..\..\examples\$(RELEASELIBPATH)
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=6
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\examples\Release
Item5=Release

[HistoryLists\hlFinalOutputDir]
Count=5
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\examples\Release\
Item4=Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: elements.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\elements.exe
OBJFILES = debug\obj\elements.obj
RESFILES = 
MAINSOURCE = elements.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\examples
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
LIBPATH = $(BCB)\lib;..\Source\examples;debug
WARNINGS= -w-par -w-8027 -w-8026
# ---------------------------------------------------------------------------
CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q -L..\LIB\RELEASE
# ---------------------------------------------------------------------------
ALLOBJ = c0x32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.LIB import32.lib cw32i.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: expat.bpf ---
USEUNIT("..\Source\lib\xmltok.c");
USEUNIT("..\Source\lib\xmlrole.c");
USEUNIT("..\Source\lib\xmlparse.c");
//---------------------------------------------------------------------------
#define DllEntryPoint

--- NEW FILE: expat.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=7
Item0=$(BCB)\include;..\Source\lib
Item1=..\Source\lib;$(BCB)\include
Item2=..\Source\lib;..\lib;$(BCB)\include
Item3=..\lib;$(BCB)\include
Item4=..\..\..\lib;$(BCB)\include
Item5=$(BCB)\include
Item6=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=..\Source\lib;$(BCB)\lib
Item1=$(BCB)\lib
Item2=$(BCB)\lib;..\Source\lib
Item3=..\Source\lib
Item4=..\Source\lib;..\lib;$(BCB)\lib;..\lib\$(RELEASELIBPATH)
Item5=..\lib;$(BCB)\lib;..\lib\$(RELEASELIBPATH)
Item6=..\..\..\lib;$(BCB)\lib;..\..\..\lib\$(RELEASELIBPATH)
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=6
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\lib\Release
Item5=Release

[HistoryLists\hlFinalOutputDir]
Count=6
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\lib\Release\
Item4=..\..\..\lib\Release
Item5=Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: expat.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\expat.dll
OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
RESFILES = 
MAINSOURCE = expat.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\lib
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\lib
LIBPATH = ..\Source\lib;$(BCB)\lib
WARNINGS= -w-rch -w-par -w-ccc
# ---------------------------------------------------------------------------
CFLAG1 = -WD -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -tWM -c -tWD
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -aa -Tpd -x -Gn -Gi -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0d32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: expatw.bpf ---
USEUNIT("..\Source\lib\xmltok.c");
USEUNIT("..\Source\lib\xmlrole.c");
USEUNIT("..\Source\lib\xmlparse.c");
//---------------------------------------------------------------------------
#define DllEntryPoint

--- NEW FILE: expatw.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=6
Item0=$(BCB)\include;..\Source\lib
Item1=..\Source\lib;..\lib;$(BCB)\include
Item2=..\lib;$(BCB)\include
Item3=..\..\..\lib;$(BCB)\include
Item4=$(BCB)\include
Item5=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=$(BCB)\lib;..\Source\lib
Item1=..\Source\lib;$(BCB)\lib
Item2=$(BCB)\lib
Item3=..\Source\lib;..\lib;$(BCB)\lib
Item4=..\lib;$(BCB)\lib
Item5=..\..\..\lib;$(BCB)\lib
Item6=..\..\..\lib;$(BCB)\lib;..\..\..\lib\$(RELEASELIBPATH)
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=7
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\..\win32\release
Item5=..\..\..\lib\Release-w
Item6=Release-w

[HistoryLists\hlFinalOutputDir]
Count=7
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\..\win32\release\
Item4=..\..\..\..\win32\release
Item5=..\..\..\lib\Release-w\
Item6=Release-w\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: expatw.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\expatw.dll
OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
RESFILES = 
MAINSOURCE = expatw.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\lib
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\lib
LIBPATH = $(BCB)\lib;..\Source\lib
WARNINGS= -w-rch -w-par -w-8027 -w-8026 -w-ccc
# ---------------------------------------------------------------------------
CFLAG1 = -WD -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -tWM -c -tWD
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -aa -Tpd -x -Gn -Gi -w -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0d32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: gennmtab.bpf ---
USEUNIT("..\Source\gennmtab\gennmtab.c");
//---------------------------------------------------------------------------
#define WinMain

--- NEW FILE: gennmtab.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=8
Item0=$(BCB)\include;..\Source\gennmtab;..\Source\lib
Item1=..\Source\gennmtab;$(BCB)\include;..\Source\Source\gennmtab
Item2=$(BCB)\include;..\Source\gennmtab
Item3=..\..\gennmtab;$(BCB)\include
Item4=..\gennmtab;$(BCB)\include
Item5=..\..\..\gennmtab;$(BCB)\include
Item6=$(BCB)\include
Item7=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=$(BCB)\lib;..\Source\gennmtab;debug
Item1=$(BCB)\lib;..\Source\gennmtab;.\debug
Item2=..\Source\gennmtab;$(BCB)\lib;..\Source\Source\gennmtab;..\Source\gennmtab\debug
Item3=..\..\gennmtab;$(BCB)\lib;..\..\BCB5\debug
Item4=$(BCB)\lib;.\debug
Item5=..\gennmtab;$(BCB)\lib;..\lib\release
Item6=..\..\..\gennmtab;$(BCB)\lib;..\..\..\lib\release
Item7=$(BCB)\lib;..\lib\release
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=WIN32;NDEBUG;_CONSOLE;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=8
Item0=debug\obj
Item1=..\..\BCB5\debug\obj
Item2=..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug\obj
Item4=..\..\..\..\win32\debug
Item5=..\..\..\gennmtab\Release
Item6=Release
Item7=.\Release

[HistoryLists\hlFinalOutputDir]
Count=5
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\Release\
Item4=.\Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: gennmtab.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\gennmtab.exe
OBJFILES = debug\obj\gennmtab.obj
RESFILES = 
MAINSOURCE = gennmtab.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\gennmtab
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = WIN32;NDEBUG;_CONSOLE;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\gennmtab;..\Source\lib
LIBPATH = $(BCB)\lib;..\Source\gennmtab;debug
WARNINGS= -w-par -w-8027 -w-8026
# ---------------------------------------------------------------------------
CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -c
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x809 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0x32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: makefile.mak ---
all: setup expat expatw elements gennmtab outline xmlwf

setup:
 setup

expat:
 make -f expat.mak

expatw:
 make -f expatw.mak

elements:
 make -f elements.mak

gennmtab:
 make -f gennmtab.mak

outline:
 make -f outline.mak

xmlwf:
 make -f xmlwf.mak

clean:
 deltree /y debug\obj

distclean:
 deltree /y debug\*.*

--- NEW FILE: outline.bpf ---
USEUNIT("..\Source\examples\outline.c");
//---------------------------------------------------------------------------
#define WinMain

--- NEW FILE: outline.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=7
Item0=$(BCB)\include;..\Source\examples;..\Source\lib
Item1=..\Source\examples;..\examples;$(BCB)\include;..\lib
Item2=..\examples;$(BCB)\include;..\lib
Item3=..\..\..\examples;$(BCB)\include;..\..\..\lib
Item4=..\..\..\examples;$(BCB)\include
Item5=$(BCB)\include
Item6=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=11
Item0=$(BCB)\lib;..\Source\examples;debug
Item1=$(BCB)\lib;..\Source\examples;.\debug
Item2=..\Source\examples;..\examples;$(BCB)\lib;..\lib\Release
Item3=..\examples;$(BCB)\lib;..\lib\Release
Item4=..\..\..\examples;$(BCB)\lib;..\..\..\lib\Release
Item5=..\..\..\examples;$(BCB)\lib;..\..\..\examples\$(RELEASELIBPATH);..\..\..\lib\Release
Item6=$(BCB)\lib;$(RELEASELIBPATH);..\lib\Release
Item7=$(BCB)\lib;$(RELEASELIBPATH);C:\src\expat2\expat\lib\Release
Item8=$(BCB)\lib;$(RELEASELIBPATH)
Item9=$(BCB)\lib;$(RELEASELIBPATH);C:\src\expat2\expat\lib
Item10=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=6
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\examples\Release
Item5=Release

[HistoryLists\hlFinalOutputDir]
Count=5
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\examples\Release\
Item4=Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: outline.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\outline.exe
OBJFILES = debug\obj\outline.obj
RESFILES = 
MAINSOURCE = outline.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\examples
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
LIBPATH = $(BCB)\lib;..\Source\examples;debug
WARNINGS= -w-par -w-8027 -w-8026
# ---------------------------------------------------------------------------
CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0x32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: setup.bat ---
REM CommandInterpreter: $(COMSPEC)
if not exist .\debug\nul mkdir debug
if not exist .\debug\obj\nul mkdir debug\obj

--- NEW FILE: xmlwf.bpf ---
USEUNIT("..\Source\xmlwf\xmlfile.c");
USEUNIT("..\Source\xmlwf\readfilemap.c");
USEUNIT("..\Source\xmlwf\win32filemap.c");
USEUNIT("..\Source\xmlwf\codepage.c");
USEUNIT("..\Source\xmlwf\xmlwf.c");
//---------------------------------------------------------------------------
#define WinMain

--- NEW FILE: xmlwf.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=7
Item0=$(BCB)\include;..\Source\xmlwf;..\Source\lib
Item1=..\Source\xmlwf;..\xmlwf;$(BCB)\include;..\lib
Item2=..\xmlwf;$(BCB)\include;..\lib
Item3=..\..\..\xmlwf;$(BCB)\include;..\..\..\lib
Item4=..\..\..\xmlwf;$(BCB)\include
Item5=$(BCB)\include
Item6=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=$(BCB)\lib;..\Source\xmlwf;.\debug
Item1=..\Source\xmlwf;..\xmlwf;$(BCB)\lib;..\lib\Release
Item2=..\xmlwf;$(BCB)\lib;..\lib\Release
Item3=..\..\..\xmlwf;$(BCB)\lib;..\..\..\lib\Release
Item4=..\..\..\xmlwf;$(BCB)\lib;..\..\..\xmlwf\$(RELEASELIBPATH);..\..\..\lib\Release
Item5=$(BCB)\lib;$(RELEASELIBPATH);..\lib\Release
Item6=$(BCB)\lib;$(RELEASELIBPATH);C:\src\expat2\expat\lib\Release
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP

[HistoryLists\hlIntOutputDir]
Count=7
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\xmlwf\Release
Item5=Release
Item6=.\Release

[HistoryLists\hlFinalOutputDir]
Count=5
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\xmlwf\Release\
Item4=.\Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  

--- NEW FILE: xmlwf.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\xmlwf.exe
OBJFILES = debug\obj\xmlfile.obj debug\obj\readfilemap.obj debug\obj\win32filemap.obj \
    debug\obj\codepage.obj debug\obj\xmlwf.obj
RESFILES = 
MAINSOURCE = xmlwf.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\Source\xmlwf
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP
SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\Source\xmlwf;..\Source\lib
LIBPATH = $(BCB)\lib;..\Source\xmlwf;debug
WARNINGS= -w-8065 -w-par -w-8027 -w-8026 -w-csu
# ---------------------------------------------------------------------------
CFLAG1 = -O2 -X- -a8 -5 -b -k -vi -q -I..\lib -c
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD
RFLAGS = /l 0x809 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zd
LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0x32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------








From fdrake@users.sourceforge.net  Thu Jul 11 20:52:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 19:52:03 2002
Subject: [Expat-checkins] expat/win32 expat.iss,1.11,1.12
Message-ID: 

Update of /cvsroot/expat/expat/win32
In directory usw-pr-cvs1:/tmp/cvs-serv10942/win32

Modified Files:
	expat.iss 
Log Message:
Add the Borland support files to the installer.

Index: expat.iss
===================================================================
RCS file: /cvsroot/expat/expat/win32/expat.iss,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- expat.iss	14 Jun 2002 14:28:12 -0000	1.11
+++ expat.iss	12 Jul 2002 02:51:56 -0000	1.12
@@ -39,6 +39,7 @@
 CopyMode: alwaysoverwrite; Source: lib\Release-w\*.dll; DestDir: "{app}\Libs"
 CopyMode: alwaysoverwrite; Source: lib\Release-w\*.lib; DestDir: "{app}\Libs"
 CopyMode: alwaysoverwrite; Source: expat.dsw;           DestDir: "{app}\Source"
+CopyMode: alwaysoverwrite; Source: bcb5\*.*;            DestDir: "{app}\Source\bcb5"
 CopyMode: alwaysoverwrite; Source: lib\*.c;             DestDir: "{app}\Source\lib"
 CopyMode: alwaysoverwrite; Source: lib\*.h;             DestDir: "{app}\Source\lib"
 CopyMode: alwaysoverwrite; Source: lib\*.dsp;           DestDir: "{app}\Source\lib"




From fdrake@users.sourceforge.net  Thu Jul 11 20:53:02 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 19:53:02 2002
Subject: [Expat-checkins] expat Changes,1.18,1.19
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv11137

Modified Files:
	Changes 
Log Message:
Add a note about the addition of Borland support files.
Include a couple of additional bug reports that have been dealt with.


Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Changes	9 Jul 2002 21:28:44 -0000	1.18
+++ Changes	12 Jul 2002 02:52:42 -0000	1.19
@@ -3,8 +3,10 @@
 	  vms/README.vms for more information.
 	- Added Mac OS (classic) support, with a makefile for MPW,
 	  contributed by Thomas Wegner and Daryle Walker.
-	- Fixed a variety of bugs: see SF bug reports 441449, 563184,
-	  564342, 566334, 569461, 570263, 575168, 579196.
+	- Added Borland C++ Builder 5 / BCC 5.5 support, contributed
+	  by Patrick McConnell (SF patch #538032).
+	- Fixed a variety of bugs: see SF issues 441449, 563184,
+	  564342, 566334, 566901, 569461, 570263, 575168, 579196.
 	- Made skippedEntityHandler conform to SAX2 (see source comment)
 	- Re-implemented WFC: Entity Declared from XML 1.0 spec and
 	  added a new error "entity declared in parameter entity":




From fdrake@users.sourceforge.net  Thu Jul 11 23:07:02 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 22:07:02 2002
Subject: [Expat-checkins] expat/win32 MANIFEST.txt,1.2,1.3
Message-ID: 

Update of /cvsroot/expat/expat/win32
In directory usw-pr-cvs1:/tmp/cvs-serv3735

Modified Files:
	MANIFEST.txt 
Log Message:
Add a note about the Borland compiler support files.
Move the second column of the table right a couple of spaces to
there's space for the long directory name on the left.


Index: MANIFEST.txt
===================================================================
RCS file: /cvsroot/expat/expat/win32/MANIFEST.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MANIFEST.txt	27 Jul 2001 20:35:39 -0000	1.2
+++ MANIFEST.txt	12 Jul 2002 05:06:17 -0000	1.3
@@ -6,19 +6,22 @@
 use Expat in their applications.  In the list below,  is the
 directory you specified to the installer.
 
-    Directory         Contents
-    ------------------------------------------------------------------
-    \            The XML well-formedness checker and some general
-                      information files.
+    Directory           Contents
+    --------------------------------------------------------------------
+    \              The XML well-formedness checker and some general
+                        information files.
 
-    \Doc\        API documentation for developers.
+    \Doc\          API documentation for developers.
 
-    \Libs\       Pre-compiled libraries for developers.
+    \Libs\         Pre-compiled libraries for developers.
 
-    \Source\     Source code, which may interest some developers,
-                      including a workspace for Microsft Visual C++.
-                      The source code includes the parser, the well-
-                      formedness checker, and a couple of small sample
-                      applications.
+    \Source\       Source code, which may interest some developers,
+                        including a workspace for Microsft Visual C++.
+                        The source code includes the parser, the well-
+                        formedness checker, and a couple of small sample
+                        applications.
 
-    \Unistall\   The uninstaller and its data files.
+    \Source\bcb5\  Project files for Borland C++ Builder 5 and BCC
+                        5.5.
+
+    \Unistall\     The uninstaller and its data files.




From fdrake@users.sourceforge.net  Thu Jul 11 23:18:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 22:18:03 2002
Subject: [Expat-checkins] expat/bcb5 elements.bpr,1.1,1.2 elements.mak,1.1,1.2 expat.bpr,1.1,1.2 expat.mak,1.1,1.2 expatw.bpr,1.1,1.2 expatw.mak,1.1,1.2 gennmtab.bpr,1.1,1.2 gennmtab.mak,1.1,1.2 outline.bpr,1.1,1.2 outline.mak,1.1,1.2 xmlwf.bpr,1.1,1.2 xmlwf.mak,1.1,1.2
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv5931

Modified Files:
	elements.bpr elements.mak expat.bpr expat.mak expatw.bpr 
	expatw.mak gennmtab.bpr gennmtab.mak outline.bpr outline.mak 
	xmlwf.bpr xmlwf.mak 
Log Message:
Change the Borland support files so that the DLLs are named libexpat.dll and
libexpatw.dll, as they are for MSVC.
Since I do not have a Borland build environment, I hope I have not botched
this change!


Index: elements.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- elements.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ elements.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -42,7 +42,7 @@
   
     
     
-    
+    
   
   
 [Version Info]
@@ -139,4 +139,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: elements.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- elements.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ elements.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -50,7 +50,7 @@
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.LIB import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 

Index: expat.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expat.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ expat.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -3,7 +3,7 @@
 
   
     
-    
+    
     
     
     
@@ -140,4 +140,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: expat.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expat.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ expat.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -13,7 +13,7 @@
 
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
-PROJECT = debug\expat.dll
+PROJECT = debug\libexpat.dll
 OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
 RESFILES = 
 MAINSOURCE = expat.bpf

Index: expatw.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expatw.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ expatw.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -3,7 +3,7 @@
 
   
     
-    
+    
     
     
     
@@ -141,4 +141,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: expatw.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/expatw.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expatw.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ expatw.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -13,7 +13,7 @@
 
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
-PROJECT = debug\expatw.dll
+PROJECT = debug\libexpatw.dll
 OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
 RESFILES = 
 MAINSOURCE = expatw.bpf

Index: gennmtab.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/gennmtab.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gennmtab.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ gennmtab.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -42,7 +42,7 @@
   
     
     
-    
+    
   
   
 [Version Info]
@@ -142,4 +142,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: gennmtab.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/gennmtab.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gennmtab.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ gennmtab.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -50,7 +50,7 @@
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 

Index: outline.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/outline.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- outline.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ outline.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -42,7 +42,7 @@
   
     
     
-    
+    
   
   
 [Version Info]
@@ -141,4 +141,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: outline.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/outline.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- outline.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ outline.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -50,7 +50,7 @@
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 

Index: xmlwf.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.bpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xmlwf.bpr	12 Jul 2002 02:46:22 -0000	1.1
+++ xmlwf.bpr	12 Jul 2002 05:17:26 -0000	1.2
@@ -43,7 +43,7 @@
   
     
     
-    
+    
   
   
 [Version Info]
@@ -141,4 +141,4 @@
 ProjectLang=
 RootDir=
   
-
\ No newline at end of file
+

Index: xmlwf.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xmlwf.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ xmlwf.mak	12 Jul 2002 05:17:26 -0000	1.2
@@ -51,7 +51,7 @@
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)
-ALLLIB = $(LIBFILES) $(LIBRARIES) EXPAT.lib import32.lib cw32i.lib
+ALLLIB = $(LIBFILES) $(LIBRARIES) libexpat.lib import32.lib cw32i.lib
 # ---------------------------------------------------------------------------
 !ifdef IDEOPTIONS
 




From fdrake@users.sourceforge.net  Thu Jul 11 23:22:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 11 22:22:03 2002
Subject: [Expat-checkins] expat README,1.18,1.19
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv6673

Modified Files:
	README 
Log Message:
Capitalize "Expat" consistently.


Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- README	9 Jul 2002 20:49:47 -0000	1.18
+++ README	12 Jul 2002 05:21:23 -0000	1.19
@@ -1,7 +1,7 @@
 
                         Expat, Release 1.95.4
 
-This is expat, a C library for parsing XML, written by James Clark.
+This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register
 handlers with the parser before starting the parse.  These handlers
 are called when the parser discovers the associated structures in the
@@ -17,12 +17,12 @@
 with this package.  This license is the same as the MIT/X Consortium
 license.
 
-Versions of expat that have an odd minor version (the middle number in
+Versions of Expat that have an odd minor version (the middle number in
 the release above), are development releases and should be considered
 as beta software.  Releases with even minor version numbers are
 intended to be production grade software.
 
-To build expat, you first run the configuration shell script in the
+To build Expat, you first run the configuration shell script in the
 top level distribution directory:
 
         ./configure




From fdrake@users.sourceforge.net  Fri Jul 12 09:08:10 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 08:08:10 2002
Subject: [Expat-checkins] expat/bcb5 xmlwf.bpf,1.1,1.2 xmlwf.bpr,1.2,1.3 xmlwf.mak,1.2,1.3
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv2233

Modified Files:
	xmlwf.bpf xmlwf.bpr xmlwf.mak 
Log Message:
xmlwf/readfilemap.c is not used on Windows.

Index: xmlwf.bpf
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.bpf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xmlwf.bpf	12 Jul 2002 02:46:22 -0000	1.1
+++ xmlwf.bpf	12 Jul 2002 15:07:30 -0000	1.2
@@ -1,5 +1,4 @@
 USEUNIT("..\Source\xmlwf\xmlfile.c");
-USEUNIT("..\Source\xmlwf\readfilemap.c");
 USEUNIT("..\Source\xmlwf\win32filemap.c");
 USEUNIT("..\Source\xmlwf\codepage.c");
 USEUNIT("..\Source\xmlwf\xmlwf.c");

Index: xmlwf.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.bpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmlwf.bpr	12 Jul 2002 05:17:26 -0000	1.2
+++ xmlwf.bpr	12 Jul 2002 15:07:30 -0000	1.3
@@ -4,7 +4,7 @@
   
     
     
-    
     
     

Index: xmlwf.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmlwf.mak	12 Jul 2002 05:17:26 -0000	1.2
+++ xmlwf.mak	12 Jul 2002 15:07:30 -0000	1.3
@@ -14,7 +14,7 @@
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
 PROJECT = debug\xmlwf.exe
-OBJFILES = debug\obj\xmlfile.obj debug\obj\readfilemap.obj debug\obj\win32filemap.obj \
+OBJFILES = debug\obj\xmlfile.obj debug\obj\win32filemap.obj \
     debug\obj\codepage.obj debug\obj\xmlwf.obj
 RESFILES = 
 MAINSOURCE = xmlwf.bpf




From fdrake@users.sourceforge.net  Fri Jul 12 09:50:16 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 08:50:16 2002
Subject: [Expat-checkins] expat configure.in,1.31,1.32
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv16982

Modified Files:
	configure.in 
Log Message:
We're building Expat, not subversion.  Appearantly a cut-n-pasto.


Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.in	12 Jun 2002 19:46:53 -0000	1.31
+++ configure.in	12 Jul 2002 15:49:33 -0000	1.32
@@ -10,7 +10,7 @@
 dnl   in the file COPYING that comes with this distribution.
 dnl
 
-dnl Ensure that subversion is configured with autoconf 2.52 or newer
+dnl Ensure that Expat is configured with autoconf 2.52 or newer
 AC_PREREQ(2.52)
 
 dnl Get the version number of Expat, using m4's esyscmd() command to run




From fdrake@users.sourceforge.net  Fri Jul 12 10:08:13 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 09:08:13 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.51,1.52
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv22282

Modified Files:
	xmlparse.c 
Log Message:
More nullification:  use "return NULL" instead of "return 0" for
functions that return pointer types.

Wrap some long lines.

Captalize the first sentences of some comments, etc.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- xmlparse.c	9 Jul 2002 20:58:04 -0000	1.51
+++ xmlparse.c	12 Jul 2002 16:07:28 -0000	1.52
@@ -163,7 +163,7 @@
   const XML_Char *notation;
   char open;
   char is_param;
-  char is_internal;  /* true if declared in internal subset outside of any PE */
+  char is_internal;  /* true if declared in internal subset outside any PE */
 } ENTITY;
 
 typedef struct {
@@ -669,7 +669,7 @@
   if (!parserInit(parser, encodingName) || !atts
       || !dataBuf || (encodingName && !protocolEncodingName)) {
     XML_ParserFree(parser);
-    return 0;
+    return NULL;
   }
 
   if (nameSep) {
@@ -679,7 +679,7 @@
 
     if (!setContext(parser, implicitContext)) {
       XML_ParserFree(parser);
-      return 0;
+      return NULL;
     }
   }
   else {
@@ -838,7 +838,7 @@
   }
 
   if (!parser)
-    return 0;
+    return NULL;
 
   startElementHandler = oldStartElementHandler;
   endElementHandler = oldEndElementHandler;
@@ -878,7 +878,7 @@
 #endif /* XML_DTD */
     if (!dtdCopy(&dtd, oldDtd, parser) || !setContext(parser, context)) {
       XML_ParserFree(parser);
-      return 0;
+      return NULL;
     }
     processor = externalEntityInitProcessor;
 #ifdef XML_DTD
@@ -1303,7 +1303,7 @@
       newBuf = MALLOC(bufferSize);
       if (newBuf == 0) {
         errorCode = XML_ERROR_NO_MEMORY;
-        return 0;
+        return NULL;
       }
       bufferLim = newBuf + bufferSize;
 #ifdef XML_CONTEXT_BYTES
@@ -1427,7 +1427,7 @@
   };
   if (code > 0 && code < sizeof(message)/sizeof(message[0]))
     return message[code];
-  return 0;
+  return NULL;
 }
 
 const XML_LChar *
@@ -1493,10 +1493,11 @@
   int tok = XmlContentTok(encoding, start, end, &next);
   switch (tok) {
   case XML_TOK_BOM:
-    /* if we are at the end of the buffer, this would cause the next stage,
+    /* If we are at the end of the buffer, this would cause the next stage,
        i.e. externalEntityInitProcessor3, to pass control directly to
        doContent (by detecting XML_TOK_NONE) without processing any xml text
-       declaration - causing the error XML_ERROR_MISPLACED_XML_PI in doContent  */
+       declaration - causing the error XML_ERROR_MISPLACED_XML_PI in doContent.
+    */
     if (next == end && endPtr) {
       *endPtr = next;
       return XML_ERROR_NONE;
@@ -1656,9 +1657,9 @@
           return XML_ERROR_NO_MEMORY;
         entity = (ENTITY *)lookup(&dtd.generalEntities, name, 0);
         poolDiscard(&dtd.pool);
-        /* first, determine if a check for an existing declaration is needed;
+        /* First, determine if a check for an existing declaration is needed;
            if yes, check that the entity exists, and that it is internal,
-           otherwise call the skipped entity or default handler
+           otherwise call the skipped entity or default handler.
         */
         if (!dtd.hasParamEntities || dtd.standalone) {
           if (!entity)
@@ -1955,8 +1956,8 @@
            be incorrectly escaped).
 
            However, now we have a start/endCdataSectionHandler, so it seems
-           easier to let the user deal with this. */
-
+           easier to let the user deal with this.
+        */
         else if (characterDataHandler)
           characterDataHandler(handlerArg, dataBuf, 0);
 #endif
@@ -2346,8 +2347,8 @@
 }
 
 /* The idea here is to avoid using stack for each CDATA section when
-the whole file is parsed with one call. */
-
+   the whole file is parsed with one call.
+*/
 static
 enum XML_Error cdataSectionProcessor(XML_Parser parser,
                                      const char *start,
@@ -2370,8 +2371,8 @@
 }
 
 /* startPtr gets set to non-null is the section is closed, and to null if
-the section is not yet closed. */
-
+   the section is not yet closed.
+*/
 static
 enum XML_Error doCdataSection(XML_Parser parser,
                               const ENCODING *enc,
@@ -2468,8 +2469,8 @@
 #ifdef XML_DTD
 
 /* The idea here is to avoid using stack for each IGNORE section when
-the whole file is parsed with one call. */
-
+   the whole file is parsed with one call.
+*/
 static
 enum XML_Error ignoreSectionProcessor(XML_Parser parser,
                                       const char *start,
@@ -2485,9 +2486,9 @@
   return result;
 }
 
-/* startPtr gets set to non-null is the section is closed, and to null if
-the section is not yet closed. */
-
+/* startPtr gets set to non-null is the section is closed, and to null
+   if the section is not yet closed.
+*/
 static
 enum XML_Error doIgnoreSection(XML_Parser parser,
                                const ENCODING *enc,
@@ -2776,12 +2777,13 @@
       processor = entityValueProcessor;
       return entityValueProcessor(parser, next, end, nextPtr);
     }
-    /* if we are at the end of the buffer, this would cause XmlPrologTok to
+    /* If we are at the end of the buffer, this would cause XmlPrologTok to
        return XML_TOK_NONE on the next call, which would then cause the
        function to exit with *nextPtr set to s - that is what we want for other
        tokens, but not for the BOM - we would rather like to skip it;
        then, when this routine is entered the next time, XmlPrologTok will
-       return XML_TOK_INVALID, since the BOM is still in the buffer            */
+       return XML_TOK_INVALID, since the BOM is still in the buffer
+    */
     else if (tok == XML_TOK_BOM && next == end && nextPtr) {
       *nextPtr = next;
       return XML_ERROR_NONE;
@@ -2818,9 +2820,10 @@
       break;
     }
   }
-  /* this would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
+  /* This would cause the next stage, i.e. doProlog to be passed XML_TOK_BOM.
      However, when parsing an external subset, doProlog will not accept a BOM
-     as valid, and report a syntax error, so we have to skip the BOM          */
+     as valid, and report a syntax error, so we have to skip the BOM
+  */
   else if (tok == XML_TOK_BOM) {
     s = next;
     tok = XmlPrologTok(encoding, s, end, &next);
@@ -2989,7 +2992,9 @@
 #endif /* XML_DTD */
     case XML_ROLE_DOCTYPE_PUBLIC_ID:
       if (startDoctypeDeclHandler) {
-        doctypePubid = poolStoreString(&tempPool, enc, s + enc->minBytesPerChar, next - enc->minBytesPerChar);
+        doctypePubid = poolStoreString(&tempPool, enc,
+                                       s + enc->minBytesPerChar,
+                                       next - enc->minBytesPerChar);
         if (!doctypePubid)
           return XML_ERROR_NO_MEMORY;
         poolFinish(&tempPool);
@@ -3023,8 +3028,10 @@
                                 doctypeSysid, doctypePubid, 0);
         poolClear(&tempPool);
       }
-      /* doctypeSysid will be non-NULL in the case of XML_ROLE_DOCTYPE_SYSTEM_ID,
-         even if startDoctypeDeclHandler was not set, indicating an external subset */
+      /* doctypeSysid will be non-NULL in the case of
+         XML_ROLE_DOCTYPE_SYSTEM_ID, even if startDoctypeDeclHandler
+         was not set, indicating an external subset
+      */
       if ((dtd.keepProcessing || dtd.standalone) && doctypeSysid) {
 #ifdef XML_DTD
         if (paramEntityParsing && externalEntityRefHandler) {
@@ -3503,7 +3510,7 @@
            otherwise call the skipped entity handler
         */
         if (prologState.documentEntity &&
-          (dtd.standalone ? !openInternalEntities : !dtd.hasParamEntities)) {
+            (dtd.standalone ? !openInternalEntities : !dtd.hasParamEntities)) {
           if (!entity)
             return XML_ERROR_UNDEFINED_ENTITY;
           else if (!entity->is_internal)
@@ -3613,7 +3620,9 @@
         ELEMENT_TYPE *el;
         const XML_Char *name;
         int nameLen;
-        const char *nxt = quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar;
+        const char *nxt = (quant == XML_CQUANT_NONE
+                           ? next
+                           : next - enc->minBytesPerChar);
         int myindex = nextScaffoldPart(parser);
         if (myindex < 0)
           return XML_ERROR_NO_MEMORY;
@@ -3906,7 +3915,8 @@
             return XML_ERROR_ENTITY_DECLARED_IN_PE;
         }
         else if (!entity) {
-          /* cannot report skipped entity here - see comments to skippedEntityHandler
+          /* cannot report skipped entity here - see comments on
+             skippedEntityHandler
           if (skippedEntityHandler)
             skippedEntityHandler(handlerArg, name, 0);
           */
@@ -3993,7 +4003,8 @@
         poolDiscard(&tempPool);
         if (!entity) {
           /* not a well-formedness error - see XML 1.0: WFC Entity Declared */
-          /* cannot report skipped entity here - see comments to skippedEntityHandler
+          /* cannot report skipped entity here - see comments on
+             skippedEntityHandler
           if (skippedEntityHandler)
             skippedEntityHandler(handlerArg, name, 0);
           */
@@ -4029,7 +4040,8 @@
           result = storeEntityValue(parser,
                                     internalEncoding,
                                     (char *)entity->textPtr,
-                                    (char *)(entity->textPtr + entity->textLen));
+                                    (char *)(entity->textPtr
+                                             + entity->textLen));
           entity->open = 0;
           if (result)
             goto endEntityValue;
@@ -4294,14 +4306,14 @@
   ATTRIBUTE_ID *id;
   const XML_Char *name;
   if (!poolAppendChar(&dtd.pool, XML_T('\0')))
-    return 0;
+    return NULL;
   name = poolStoreString(&dtd.pool, enc, start, end);
   if (!name)
-    return 0;
+    return NULL;
   ++name;
   id = (ATTRIBUTE_ID *)lookup(&dtd.attributeIds, name, sizeof(ATTRIBUTE_ID));
   if (!id)
-    return 0;
+    return NULL;
   if (id->name != name)
     poolDiscard(&dtd.pool);
   else {
@@ -4357,7 +4369,7 @@
     int i;
     int len;
     if (!poolAppendChar(&tempPool, XML_T('=')))
-      return 0;
+      return NULL;
     len = dtd.defaultPrefix.binding->uriLen;
     if (namespaceSeparator != XML_T('\0'))
       len--;
@@ -4378,12 +4390,12 @@
     if (!prefix->binding)
       continue;
     if (needSep && !poolAppendChar(&tempPool, CONTEXT_SEP))
-      return 0;
+      return NULL;
     for (s = prefix->name; *s; s++)
       if (!poolAppendChar(&tempPool, *s))
-        return 0;
+        return NULL;
     if (!poolAppendChar(&tempPool, XML_T('=')))
-      return 0;
+      return NULL;
     len = prefix->binding->uriLen;
     if (namespaceSeparator != XML_T('\0'))
       len--;
@@ -4403,7 +4415,7 @@
     if (!e->open)
       continue;
     if (needSep && !poolAppendChar(&tempPool, CONTEXT_SEP))
-      return 0;
+      return NULL;
     for (s = e->name; *s; s++)
       if (!poolAppendChar(&tempPool, *s))
         return 0;
@@ -4411,7 +4423,7 @@
   }
 
   if (!poolAppendChar(&tempPool, XML_T('\0')))
-    return 0;
+    return NULL;
   return tempPool.start;
 }
 
@@ -4798,11 +4810,11 @@
     size_t tsize;
 
     if (!createSize)
-      return 0;
+      return NULL;
     tsize = INIT_SIZE * sizeof(NAMED *);
     table->v = table->mem->malloc_fcn(tsize);
     if (!table->v)
-      return 0;
+      return NULL;
     memset(table->v, 0, tsize);
     table->size = INIT_SIZE;
     table->usedLim = INIT_SIZE / 2;
@@ -4817,14 +4829,14 @@
         return table->v[i];
     }
     if (!createSize)
-      return 0;
+      return NULL;
     if (table->used == table->usedLim) {
       /* check for overflow */
       size_t newSize = table->size * 2;
       size_t tsize = newSize * sizeof(NAMED *);
       NAMED **newV = table->mem->malloc_fcn(tsize);
       if (!newV)
-        return 0;
+        return NULL;
       memset(newV, 0, tsize);
       for (i = 0; i < table->size; i++)
         if (table->v[i]) {
@@ -4847,7 +4859,7 @@
   }
   table->v[i] = table->mem->malloc_fcn(createSize);
   if (!table->v[i])
-    return 0;
+    return NULL;
   memset(table->v[i], 0, createSize);
   table->v[i]->name = name;
   (table->used)++;
@@ -4892,7 +4904,7 @@
     if (tem)
       return tem;
   }
-  return 0;
+  return NULL;
 }
 
 
@@ -4954,13 +4966,13 @@
                      const char *ptr, const char *end)
 {
   if (!pool->ptr && !poolGrow(pool))
-    return 0;
+    return NULL;
   for (;;) {
     XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end);
     if (ptr == end)
       break;
     if (!poolGrow(pool))
-      return 0;
+      return NULL;
   }
   return pool->start;
 }
@@ -4969,7 +4981,7 @@
 {
   do {
     if (!poolAppendChar(pool, *s))
-      return 0;
+      return NULL;
   } while (*s++);
   s = pool->start;
   poolFinish(pool);
@@ -4980,10 +4992,10 @@
                                        const XML_Char *s, int n)
 {
   if (!pool->ptr && !poolGrow(pool))
-    return 0;
+    return NULL;
   for (; n > 0; --n, s++) {
     if (!poolAppendChar(pool, *s))
-      return 0;
+      return NULL;
 
   }
   s = pool->start;
@@ -4996,7 +5008,7 @@
 {
   while (*s) {
     if (!poolAppendChar(pool, *s))
-      return 0;
+      return NULL;
     s++;
   }
   return pool->start;
@@ -5007,9 +5019,9 @@
                           const char *ptr, const char *end)
 {
   if (!poolAppend(pool, enc, ptr, end))
-    return 0;
+    return NULL;
   if (pool->ptr == pool->end && !poolGrow(pool))
-    return 0;
+    return NULL;
   *(pool->ptr)++ = 0;
   return pool->start;
 }
@@ -5165,11 +5177,12 @@
   XML_Content *ret;
   XML_Content *cpos;
   XML_Char * str;
-  int allocsize = dtd.scaffCount * sizeof(XML_Content) + (dtd.contentStringLen * sizeof(XML_Char));
+  int allocsize = (dtd.scaffCount * sizeof(XML_Content)
+                   + (dtd.contentStringLen * sizeof(XML_Char)));
 
   ret = MALLOC(allocsize);
   if (!ret)
-    return 0;
+    return NULL;
 
   str =  (XML_Char *) (&ret[dtd.scaffCount]);
   cpos = &ret[1];
@@ -5188,17 +5201,16 @@
   ELEMENT_TYPE *ret;
 
   if (!name)
-    return 0;
+    return NULL;
   ret = (ELEMENT_TYPE *) lookup(&dtd.elementTypes, name, sizeof(ELEMENT_TYPE));
   if (!ret)
-    return 0;
+    return NULL;
   if (ret->name != name)
     poolDiscard(&dtd.pool);
   else {
     poolFinish(&dtd.pool);
     if (!setElementTypePrefix(parser, ret))
-      return 0;
+      return NULL;
   }
   return ret;
 }  /* End getElementType */
-




From fdrake@users.sourceforge.net  Fri Jul 12 10:25:11 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 09:25:11 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.52,1.53
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27704

Modified Files:
	xmlparse.c 
Log Message:
Present signature lines for function declarations much more
consistently.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- xmlparse.c	12 Jul 2002 16:07:28 -0000	1.52
+++ xmlparse.c	12 Jul 2002 16:24:33 -0000	1.53
@@ -298,12 +298,12 @@
 doIgnoreSection(XML_Parser parser, const ENCODING *, const char **startPtr,
                 const char *end, const char **nextPtr);
 #endif /* XML_DTD */
-static enum XML_Error storeAtts(XML_Parser parser, const ENCODING *,
-                                const char *s,
-                                TAG_NAME *tagNamePtr, BINDING **bindingsPtr);
-static
-int addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
-               const XML_Char *uri, BINDING **bindingsPtr);
+static enum XML_Error
+storeAtts(XML_Parser parser, const ENCODING *,
[...1086 lines suppressed...]
-}  /* End build_node */
+}
 
 static XML_Content *
 build_model (XML_Parser parser)
@@ -5189,7 +5248,7 @@
 
   build_node(parser, 0, ret, &cpos, &str);
   return ret;
-}  /* End build_model */
+}
 
 static ELEMENT_TYPE *
 getElementType(XML_Parser parser,
@@ -5213,4 +5272,4 @@
       return NULL;
   }
   return ret;
-}  /* End getElementType */
+}




From gstein@lyra.org  Fri Jul 12 11:32:07 2002
From: gstein@lyra.org (Greg Stein)
Date: Fri Jul 12 10:32:07 2002
Subject: [Expat-checkins] expat configure.in,1.31,1.32
In-Reply-To: ; from fdrake@users.sourceforge.net on Fri, Jul 12, 2002 at 08:49:35AM -0700
References: 
Message-ID: <20020712103329.B14327@lyra.org>

*snicker*


On Fri, Jul 12, 2002 at 08:49:35AM -0700, fdrake@users.sourceforge.net wrote:
> Update of /cvsroot/expat/expat
> In directory usw-pr-cvs1:/tmp/cvs-serv16982
> 
> Modified Files:
> 	configure.in 
> Log Message:
> We're building Expat, not subversion.  Appearantly a cut-n-pasto.
> 
> 
> Index: configure.in
> ===================================================================
> RCS file: /cvsroot/expat/expat/configure.in,v
> retrieving revision 1.31
> retrieving revision 1.32
> diff -u -d -r1.31 -r1.32
> --- configure.in	12 Jun 2002 19:46:53 -0000	1.31
> +++ configure.in	12 Jul 2002 15:49:33 -0000	1.32
> @@ -10,7 +10,7 @@
>  dnl   in the file COPYING that comes with this distribution.
>  dnl
>  
> -dnl Ensure that subversion is configured with autoconf 2.52 or newer
> +dnl Ensure that Expat is configured with autoconf 2.52 or newer
>  AC_PREREQ(2.52)
>  
>  dnl Get the version number of Expat, using m4's esyscmd() command to run
> 
> 
> 
> 
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Gadgets, caffeine, t-shirts, fun stuff.
> http://thinkgeek.com/sf
> _______________________________________________
> Expat-checkins mailing list
> Expat-checkins@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/expat-checkins

-- 
Greg Stein, http://www.lyra.org/


From fdrake@acm.org  Fri Jul 12 11:39:08 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Fri Jul 12 10:39:08 2002
Subject: [Expat-checkins] expat configure.in,1.31,1.32
In-Reply-To: <20020712103329.B14327@lyra.org>
References: 
	<20020712103329.B14327@lyra.org>
Message-ID: <15663.5130.408782.306738@grendel.zope.com>

Greg Stein writes:
 > *snicker*

Do you think it's funny, or are you hinting that every application of
Expat is actually a subversion server?  ;-)


  -Fred

-- 
Fred L. Drake, Jr.  
PythonLabs at Zope Corporation


From fdrake@users.sourceforge.net  Fri Jul 12 12:39:08 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 11:39:08 2002
Subject: [Expat-checkins] htdocs/dev index.html,1.6,1.7
Message-ID: 

Update of /cvsroot/expat/htdocs/dev
In directory usw-pr-cvs1:/tmp/cvs-serv5394

Modified Files:
	index.html 
Log Message:
Change the "next release" to 1.95.5.

Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/dev/index.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.html	8 Jul 2002 16:03:16 -0000	1.6
+++ index.html	12 Jul 2002 18:38:06 -0000	1.7
@@ -19,11 +19,11 @@
 of Expat.
            
 
 
              
-  
            •  Requirements for the next
-  release (1.95.4).
+  
            •  Requirements for the next
+  release (1.95.5).
   
              
   Other releases:
-  1.95.5
+  1.95.4
   
              • 
 
   
            •  CVS instructions for developers and




From fdrake@users.sourceforge.net  Fri Jul 12 12:40:08 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Fri Jul 12 11:40:08 2002
Subject: [Expat-checkins] htdocs index.html,1.24,1.25
Message-ID: 

Update of /cvsroot/expat/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv5850

Modified Files:
	index.html 
Log Message:
Add news for the 1.95.4 release.

Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- index.html	28 Jun 2002 04:03:36 -0000	1.24
+++ index.html	12 Jul 2002 18:39:32 -0000	1.25
@@ -49,6 +49,31 @@
 
              News
              
 
 
              
+  
              12 July 2002
              
+      Expat 1.95.4 released.
              
+  
              
+    
                
+      
              •  Added support for VMS, contributed by Craig Berry.  See
+	   vms/README.vms in the distrubution for more information. 
                • 
+      
              •  Added Mac OS (classic) support, with a makefile for MPW,
+	   contributed by Thomas Wegner and Daryle Walker. 
                • 
+      
              •  Added Borland C++ Builder 5 / BCC 5.5 support, contributed
+	   by Patrick McConnell (SF patch #538032). 
                • 
+      
              •  Fixed a variety of bugs: see SF issues 441449, 563184,
+	   564342, 566334, 566901, 569461, 570263, 575168, 579196. 
                • 
+      
              •  Made skippedEntityHandler conform to SAX2 (see source
+	   comment). 
                • 
+      
              •  Re-implemented WFC: Entity Declared from XML 1.0 spec and
+	   added a new error "entity declared in parameter entity":
+	   see SF bug report 569461 and SF patch 578161. 
                • 
+      
              •  Re-implemented section 5.1 from XML 1.0 spec:
+	   see SF bug report 570263 and SF patch 578161. 
                • 
+    
              
+    Expat 1.95.3 is being withdrawn due to bug #566334.  If you are currently using Expat 1.95.3, please
+    update to 1.95.4.
+    
              
   
              3 June 2002
              
       Expat 1.95.3 released.
              
   
              




From fdrake@users.sourceforge.net  Mon Jul 15 13:58:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Mon Jul 15 12:58:05 2002
Subject: [Expat-checkins] expat/lib expat.h,1.27,1.28
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14626

Modified Files:
	expat.h 
Log Message:
Fixup whitespace.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- expat.h	9 Jul 2002 20:58:17 -0000	1.27
+++ expat.h	15 Jul 2002 19:57:34 -0000	1.28
@@ -560,7 +560,7 @@
 
 XMLPARSEAPI(void)
 XML_SetSkippedEntityHandler(XML_Parser parser,
-                                XML_SkippedEntityHandler handler);
+                            XML_SkippedEntityHandler handler);
 
 XMLPARSEAPI(void)
 XML_SetUnknownEncodingHandler(XML_Parser parser,




From kwaclaw@users.sourceforge.net  Sat Jul 20 07:32:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 20 06:32:02 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.53,1.54
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv12385

Modified Files:
	xmlparse.c 
Log Message:
Applied patch for bug #584183: crash in builds without DTD support

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- xmlparse.c	12 Jul 2002 16:24:33 -0000	1.53
+++ xmlparse.c	20 Jul 2002 13:31:06 -0000	1.54
@@ -764,10 +764,8 @@
 #ifdef XML_DTD
   isParamEntity = 0;
   paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
-  return dtdInit(&dtd, parser);
-#else
-  return 1;
 #endif
+  return dtdInit(&dtd, parser);
 }
 
 int




From kwaclaw@users.sourceforge.net  Mon Jul 22 07:33:08 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Mon Jul 22 06:33:08 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.54,1.55
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6740

Modified Files:
	xmlparse.c 
Log Message:
Fix for bug #584832: incorrect handling of internal entities.
The wrong string pool was cleared.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- xmlparse.c	20 Jul 2002 13:31:06 -0000	1.54
+++ xmlparse.c	22 Jul 2002 13:32:37 -0000	1.55
@@ -2700,7 +2700,7 @@
           return XML_ERROR_NO_MEMORY;
       }
       result = handleUnknownEncoding(parser, storedEncName);
-      poolClear(&tempPool);
+      poolClear(&temp2Pool);
       if (result == XML_ERROR_UNKNOWN_ENCODING)
         eventPtr = encodingName;
       return result;




From fdrake@users.sourceforge.net  Mon Jul 22 11:16:08 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Mon Jul 22 10:16:08 2002
Subject: [Expat-checkins] expat/tests runtests.c,1.24,1.25
Message-ID: 

Update of /cvsroot/expat/expat/tests
In directory usw-pr-cvs1:/tmp/cvs-serv26697

Modified Files:
	runtests.c 
Log Message:
Added regression test for SF bug #584832, adapted from contributed
test.


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- runtests.c	9 Jul 2002 21:17:45 -0000	1.24
+++ runtests.c	22 Jul 2002 17:15:48 -0000	1.25
@@ -481,6 +481,35 @@
 }
 END_TEST
 
+/* Regression test for SF bug #584832. */
+static int
+UnknownEncodingHandler(void *data,const XML_Char *encoding,XML_Encoding *info)
+{
+    if (strcmp(encoding,"unsupported-encoding") == 0) {
+        int i;
+        for (i = 0; i < 256; ++i)
+            info->map[i] = i;
+        info->data=NULL;
+        info->convert=NULL;
+        info->release=NULL;
+        return 1;
+    }
+    return 0;
+}
+
+START_TEST(test_xmldecl_unknown_encoding_internal_entity)
+{
+    char *text =
+        "\n"
+        "]>\n"
+        "";
+
+    XML_SetUnknownEncodingHandler(parser, UnknownEncodingHandler, NULL);
+    if (!XML_Parse(parser, text, strlen(text), 1))
+        xml_failure(parser);
+}
+END_TEST
+
 
 /*
  * Namespaces tests.
@@ -674,6 +703,7 @@
     suite_add_tcase(s, tc_xmldecl);
     tcase_add_checked_fixture(tc_xmldecl, basic_setup, basic_teardown);
     tcase_add_test(tc_xmldecl, test_xmldecl_misplaced);
+    tcase_add_test(tc_xmldecl, test_xmldecl_unknown_encoding_internal_entity);
 
     suite_add_tcase(s, tc_namespace);
     tcase_add_checked_fixture(tc_namespace,




From fdrake@users.sourceforge.net  Mon Jul 22 11:50:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Mon Jul 22 10:50:05 2002
Subject: [Expat-checkins] expat/tests runtests.c,1.25,1.26
Message-ID: 

Update of /cvsroot/expat/expat/tests
In directory usw-pr-cvs1:/tmp/cvs-serv5541

Modified Files:
	runtests.c 
Log Message:
make_basic_suite():  Simplify the organization of the test cases into
    just two groups: "basic" (no namespaces) and "namespace".

Rename one test function so it's name makes more sense, and is
shorter.


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- runtests.c	22 Jul 2002 17:15:48 -0000	1.25
+++ runtests.c	22 Jul 2002 17:49:17 -0000	1.26
@@ -497,7 +497,7 @@
     return 0;
 }
 
-START_TEST(test_xmldecl_unknown_encoding_internal_entity)
+START_TEST(test_unknown_encoding_internal_entity)
 {
     char *text =
         "\n"
@@ -666,44 +666,32 @@
 make_basic_suite(void)
 {
     Suite *s = suite_create("basic");
-    TCase *tc_chars = tcase_create("character tests");
-    TCase *tc_attrs = tcase_create("attributes");
-    TCase *tc_xmldecl = tcase_create("XML declaration");
+    TCase *tc_basic = tcase_create("basic tests");
     TCase *tc_namespace = tcase_create("XML namespaces");
-    TCase *tc_elements = tcase_create("element events");
 
-    suite_add_tcase(s, tc_chars);
-    tcase_add_checked_fixture(tc_chars, basic_setup, basic_teardown);
-    tcase_add_test(tc_chars, test_nul_byte);
-    tcase_add_test(tc_chars, test_u0000_char);
-    tcase_add_test(tc_chars, test_bom_utf8);
-    tcase_add_test(tc_chars, test_bom_utf16_be);
-    tcase_add_test(tc_chars, test_bom_utf16_le);
-    tcase_add_test(tc_chars, test_illegal_utf8);
-    tcase_add_test(tc_chars, test_utf16);
-    tcase_add_test(tc_chars, test_latin1_umlauts);
+    suite_add_tcase(s, tc_basic);
+    tcase_add_checked_fixture(tc_basic, basic_setup, basic_teardown);
+    tcase_add_test(tc_basic, test_nul_byte);
+    tcase_add_test(tc_basic, test_u0000_char);
+    tcase_add_test(tc_basic, test_bom_utf8);
+    tcase_add_test(tc_basic, test_bom_utf16_be);
+    tcase_add_test(tc_basic, test_bom_utf16_le);
+    tcase_add_test(tc_basic, test_illegal_utf8);
+    tcase_add_test(tc_basic, test_utf16);
+    tcase_add_test(tc_basic, test_latin1_umlauts);
     /* Regression test for SF bug #491986. */
-    tcase_add_test(tc_chars, test_danish_latin1);
+    tcase_add_test(tc_basic, test_danish_latin1);
     /* Regression test for SF bug #514281. */
-    tcase_add_test(tc_chars, test_french_charref_hexidecimal);
-    tcase_add_test(tc_chars, test_french_charref_decimal);
-    tcase_add_test(tc_chars, test_french_latin1);
-    tcase_add_test(tc_chars, test_french_utf8);
-    tcase_add_test(tc_chars, test_line_count);
-    tcase_add_test(tc_chars, test_really_long_lines);
-
-    suite_add_tcase(s, tc_elements);
-    tcase_add_checked_fixture(tc_elements, basic_setup, basic_teardown);
-    tcase_add_test(tc_elements, test_end_element_events);
-
-    suite_add_tcase(s, tc_attrs);
-    tcase_add_checked_fixture(tc_attrs, basic_setup, basic_teardown);
-    tcase_add_test(tc_attrs, test_attr_whitespace_normalization);
-
-    suite_add_tcase(s, tc_xmldecl);
-    tcase_add_checked_fixture(tc_xmldecl, basic_setup, basic_teardown);
-    tcase_add_test(tc_xmldecl, test_xmldecl_misplaced);
-    tcase_add_test(tc_xmldecl, test_xmldecl_unknown_encoding_internal_entity);
+    tcase_add_test(tc_basic, test_french_charref_hexidecimal);
+    tcase_add_test(tc_basic, test_french_charref_decimal);
+    tcase_add_test(tc_basic, test_french_latin1);
+    tcase_add_test(tc_basic, test_french_utf8);
+    tcase_add_test(tc_basic, test_line_count);
+    tcase_add_test(tc_basic, test_really_long_lines);
+    tcase_add_test(tc_basic, test_end_element_events);
+    tcase_add_test(tc_basic, test_attr_whitespace_normalization);
+    tcase_add_test(tc_basic, test_xmldecl_misplaced);
+    tcase_add_test(tc_basic, test_unknown_encoding_internal_entity);
 
     suite_add_tcase(s, tc_namespace);
     tcase_add_checked_fixture(tc_namespace,




From fdrake@users.sourceforge.net  Tue Jul 23 19:21:02 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Tue Jul 23 18:21:02 2002
Subject: [Expat-checkins] expat/tests runtests.c,1.26,1.27
Message-ID: 

Update of /cvsroot/expat/expat/tests
In directory usw-pr-cvs1:/tmp/cvs-serv3722/expat/tests

Modified Files:
	runtests.c 
Log Message:
Remove cruftiness.

Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- runtests.c	22 Jul 2002 17:49:17 -0000	1.26
+++ runtests.c	24 Jul 2002 01:20:18 -0000	1.27
@@ -157,7 +157,6 @@
              "J\xC3\xB8rgen \xC3\xA6\xC3\xB8\xC3\xA5\xC3\x86\xC3\x98\xC3\x85");
 }
 END_TEST
-/* End regression test for SF bug #491986. */
 
 
 /* Regression test for SF bug #514281. */
@@ -199,7 +198,6 @@
     run_character_check(text, "\xC3\xA9");
 }
 END_TEST
-/* End regression test for SF bug #514281. */
 
 /* Regression test for SF bug #477667.
    This test assures that any 8-bit character followed by a 7-bit




From fdrake@users.sourceforge.net  Thu Jul 25 08:48:05 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 25 07:48:05 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.55,1.56
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32490

Modified Files:
	xmlparse.c 
Log Message:
Add a whine about the C preprocessor abuse used in this file.
Wrap most of the longer lines so fit in less than 80 columns (required
for OS/400 support).


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- xmlparse.c	22 Jul 2002 13:32:37 -0000	1.55
+++ xmlparse.c	25 Jul 2002 14:47:45 -0000	1.56
@@ -832,6 +832,11 @@
 #endif
   int oldns_triplets = ns_triplets;
 
+  /* Note that the magical uses of the pre-processor to make field
+     access look more like C++ require that `parser' be overwritten
+     here.  This makes this function more painful to follow than it
+     would be otherwise.
+  */
   if (ns) {
     XML_Char tmp[2];
 
@@ -2769,9 +2774,9 @@
 
 static enum XML_Error
 externalParEntInitProcessor(XML_Parser parser,
-                    const char *s,
-                    const char *end,
-                    const char **nextPtr)
+                            const char *s,
+                            const char *end,
+                            const char **nextPtr)
 {
   enum XML_Error result = initializeEncoding(parser);
   if (result != XML_ERROR_NONE)
@@ -2794,9 +2799,9 @@
 
 static enum XML_Error
 entityValueInitProcessor(XML_Parser parser,
-                const char *s,
-                const char *end,
-                const char **nextPtr)
+                         const char *s,
+                         const char *end,
+                         const char **nextPtr)
 {
   const char *start = s;
   const char *next = s;
@@ -2848,9 +2853,9 @@
 
 static enum XML_Error
 externalParEntProcessor(XML_Parser parser,
-                const char *s,
-                const char *end,
-                const char **nextPtr)
+                        const char *s,
+                        const char *end,
+                        const char **nextPtr)
 {
   const char *start = s;
   const char *next = s;
@@ -2889,9 +2894,9 @@
 
 static enum XML_Error
 entityValueProcessor(XML_Parser parser,
-                const char *s,
-                const char *end,
-                const char **nextPtr)
+                     const char *s,
+                     const char *end,
+                     const char **nextPtr)
 {
   const char *start = s;
   const char *next = s;
@@ -2952,10 +2957,14 @@
   static const XML_Char atypeIDREF[] = { 'I', 'D', 'R', 'E', 'F', '\0' };
   static const XML_Char atypeIDREFS[] = { 'I', 'D', 'R', 'E', 'F', 'S', '\0' };
   static const XML_Char atypeENTITY[] = { 'E', 'N', 'T', 'I', 'T', 'Y', '\0' };
-  static const XML_Char atypeENTITIES[] = { 'E', 'N', 'T', 'I', 'T', 'I', 'E', 'S', '\0' };
-  static const XML_Char atypeNMTOKEN[] = { 'N', 'M', 'T', 'O', 'K', 'E', 'N', '\0' };
-  static const XML_Char atypeNMTOKENS[] = { 'N', 'M', 'T', 'O', 'K', 'E', 'N', 'S', '\0' };
-  static const XML_Char notationPrefix[] = { 'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N', '(', '\0' };
+  static const XML_Char atypeENTITIES[] =
+      { 'E', 'N', 'T', 'I', 'T', 'I', 'E', 'S', '\0' };
+  static const XML_Char atypeNMTOKEN[] = {
+      'N', 'M', 'T', 'O', 'K', 'E', 'N', '\0' };
+  static const XML_Char atypeNMTOKENS[] = {
+      'N', 'M', 'T', 'O', 'K', 'E', 'N', 'S', '\0' };
+  static const XML_Char notationPrefix[] = {
+      'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N', '(', '\0' };
   static const XML_Char enumValueSep[] = { '|', '\0' };
   static const XML_Char enumValueStart[] = { '(', '\0' };
 




From fdrake@users.sourceforge.net  Thu Jul 25 08:52:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 25 07:52:03 2002
Subject: [Expat-checkins] expat/lib xmlrole.c,1.10,1.11 xmltok.c,1.20,1.21 xmltok_impl.c,1.4,1.5
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1602

Modified Files:
	xmlrole.c xmltok.c xmltok_impl.c 
Log Message:
Shorten all lines longer than 80 characters to be shorter than 80.
Required for OS/400 support.


Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- xmlrole.c	8 Jul 2002 17:06:55 -0000	1.10
+++ xmlrole.c	25 Jul 2002 14:51:19 -0000	1.11
@@ -20,29 +20,56 @@
 
 */
 
-static const char KW_ANY[] = { ASCII_A, ASCII_N, ASCII_Y, '\0' };
-static const char KW_ATTLIST[] = { ASCII_A, ASCII_T, ASCII_T, ASCII_L, ASCII_I, ASCII_S, ASCII_T, '\0' };
-static const char KW_CDATA[] = { ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
-static const char KW_DOCTYPE[] = { ASCII_D, ASCII_O, ASCII_C, ASCII_T, ASCII_Y, ASCII_P, ASCII_E, '\0' };
-static const char KW_ELEMENT[] = { ASCII_E, ASCII_L, ASCII_E, ASCII_M, ASCII_E, ASCII_N, ASCII_T, '\0' };
-static const char KW_EMPTY[] = { ASCII_E, ASCII_M, ASCII_P, ASCII_T, ASCII_Y, '\0' };
-static const char KW_ENTITIES[] = { ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_I, ASCII_E, ASCII_S, '\0' };
-static const char KW_ENTITY[] = { ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_Y, '\0' };
-static const char KW_FIXED[] = { ASCII_F, ASCII_I, ASCII_X, ASCII_E, ASCII_D, '\0' };
-static const char KW_ID[] = { ASCII_I, ASCII_D, '\0' };
-static const char KW_IDREF[] = { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
-static const char KW_IDREFS[] = { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };
-static const char KW_IGNORE[] = { ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' };
-static const char KW_IMPLIED[] = { ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' };
-static const char KW_INCLUDE[] = { ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' };
-static const char KW_NDATA[] = { ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
-static const char KW_NMTOKEN[] = { ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, '\0' };
-static const char KW_NMTOKENS[] = { ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, ASCII_S, '\0' };
-static const char KW_NOTATION[] = { ASCII_N, ASCII_O, ASCII_T, ASCII_A, ASCII_T, ASCII_I, ASCII_O, ASCII_N, '\0' };
-static const char KW_PCDATA[] = { ASCII_P, ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
-static const char KW_PUBLIC[] = { ASCII_P, ASCII_U, ASCII_B, ASCII_L, ASCII_I, ASCII_C, '\0' };
-static const char KW_REQUIRED[] = { ASCII_R, ASCII_E, ASCII_Q, ASCII_U, ASCII_I, ASCII_R, ASCII_E, ASCII_D, '\0' };
-static const char KW_SYSTEM[] = { ASCII_S, ASCII_Y, ASCII_S, ASCII_T, ASCII_E, ASCII_M, '\0' };
+static const char KW_ANY[] = {
+    ASCII_A, ASCII_N, ASCII_Y, '\0' };
+static const char KW_ATTLIST[] = {
+    ASCII_A, ASCII_T, ASCII_T, ASCII_L, ASCII_I, ASCII_S, ASCII_T, '\0' };
+static const char KW_CDATA[] = {
+    ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
+static const char KW_DOCTYPE[] = {
+    ASCII_D, ASCII_O, ASCII_C, ASCII_T, ASCII_Y, ASCII_P, ASCII_E, '\0' };
+static const char KW_ELEMENT[] = {
+    ASCII_E, ASCII_L, ASCII_E, ASCII_M, ASCII_E, ASCII_N, ASCII_T, '\0' };
+static const char KW_EMPTY[] = {
+    ASCII_E, ASCII_M, ASCII_P, ASCII_T, ASCII_Y, '\0' };
+static const char KW_ENTITIES[] = {
+    ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_I, ASCII_E, ASCII_S,
+    '\0' };
+static const char KW_ENTITY[] = {
+    ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_Y, '\0' };
+static const char KW_FIXED[] = {
+    ASCII_F, ASCII_I, ASCII_X, ASCII_E, ASCII_D, '\0' };
+static const char KW_ID[] = {
+    ASCII_I, ASCII_D, '\0' };
+static const char KW_IDREF[] = {
+    ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' };
+static const char KW_IDREFS[] = {
+    ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' };
+static const char KW_IGNORE[] = {
+    ASCII_I, ASCII_G, ASCII_N, ASCII_O, ASCII_R, ASCII_E, '\0' };
+static const char KW_IMPLIED[] = {
+    ASCII_I, ASCII_M, ASCII_P, ASCII_L, ASCII_I, ASCII_E, ASCII_D, '\0' };
+static const char KW_INCLUDE[] = {
+    ASCII_I, ASCII_N, ASCII_C, ASCII_L, ASCII_U, ASCII_D, ASCII_E, '\0' };
+static const char KW_NDATA[] = {
+    ASCII_N, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
+static const char KW_NMTOKEN[] = {
+    ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, '\0' };
+static const char KW_NMTOKENS[] = {
+    ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, ASCII_S,
+    '\0' };
+static const char KW_NOTATION[] =
+    { ASCII_N, ASCII_O, ASCII_T, ASCII_A, ASCII_T, ASCII_I, ASCII_O, ASCII_N,
+      '\0' };
+static const char KW_PCDATA[] = {
+    ASCII_P, ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
+static const char KW_PUBLIC[] = {
+    ASCII_P, ASCII_U, ASCII_B, ASCII_L, ASCII_I, ASCII_C, '\0' };
+static const char KW_REQUIRED[] = {
+    ASCII_R, ASCII_E, ASCII_Q, ASCII_U, ASCII_I, ASCII_R, ASCII_E, ASCII_D,
+    '\0' };
+static const char KW_SYSTEM[] = {
+    ASCII_S, ASCII_Y, ASCII_S, ASCII_T, ASCII_E, ASCII_M, '\0' };
 
 #ifndef MIN_BYTES_PER_CHAR
 #define MIN_BYTES_PER_CHAR(enc) ((enc)->minBytesPerChar)

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- xmltok.c	9 Jul 2002 13:57:18 -0000	1.20
+++ xmltok.c	25 Jul 2002 14:51:19 -0000	1.21
@@ -180,6 +180,8 @@
   int (*isInvalid4)(const ENCODING *, const char *);
 };
 
+#define AS_NORMAL_ENCODING(enc)   ((const struct normal_encoding *) (enc))
+
 #ifdef XML_MIN_SIZE
 
 #define STANDARD_VTABLE(E) \
@@ -233,14 +235,14 @@
   return SB_BYTE_TYPE(enc, p);
 }
 #define BYTE_TYPE(enc, p) \
- (((const struct normal_encoding *)(enc))->byteType(enc, p))
+ (AS_NORMAL_ENCODING(enc)->byteType(enc, p))
 #else
 #define BYTE_TYPE(enc, p) SB_BYTE_TYPE(enc, p)
 #endif
 
 #ifdef XML_MIN_SIZE
 #define BYTE_TO_ASCII(enc, p) \
- (((const struct normal_encoding *)(enc))->byteToAscii(enc, p))
+ (AS_NORMAL_ENCODING(enc)->byteToAscii(enc, p))
 static int
 sb_byteToAscii(const ENCODING *enc, const char *p)
 {
@@ -251,17 +253,17 @@
 #endif
 
 #define IS_NAME_CHAR(enc, p, n) \
- (((const struct normal_encoding *)(enc))->isName ## n(enc, p))
+ (AS_NORMAL_ENCODING(enc)->isName ## n(enc, p))
 #define IS_NMSTRT_CHAR(enc, p, n) \
- (((const struct normal_encoding *)(enc))->isNmstrt ## n(enc, p))
+ (AS_NORMAL_ENCODING(enc)->isNmstrt ## n(enc, p))
 #define IS_INVALID_CHAR(enc, p, n) \
- (((const struct normal_encoding *)(enc))->isInvalid ## n(enc, p))
+ (AS_NORMAL_ENCODING(enc)->isInvalid ## n(enc, p))
 
 #ifdef XML_MIN_SIZE
 #define IS_NAME_CHAR_MINBPC(enc, p) \
- (((const struct normal_encoding *)(enc))->isNameMin(enc, p))
+ (AS_NORMAL_ENCODING(enc)->isNameMin(enc, p))
 #define IS_NMSTRT_CHAR_MINBPC(enc, p) \
- (((const struct normal_encoding *)(enc))->isNmstrtMin(enc, p))
+ (AS_NORMAL_ENCODING(enc)->isNmstrtMin(enc, p))
 #else
 #define IS_NAME_CHAR_MINBPC(enc, p) (0)
 #define IS_NMSTRT_CHAR_MINBPC(enc, p) (0)
@@ -269,7 +271,7 @@
 
 #ifdef XML_MIN_SIZE
 #define CHAR_MATCHES(enc, p, c) \
- (((const struct normal_encoding *)(enc))->charMatches(enc, p, c))
+ (AS_NORMAL_ENCODING(enc)->charMatches(enc, p, c))
 static int
 sb_charMatches(const ENCODING *enc, const char *p, int c)
 {
@@ -1229,6 +1231,8 @@
   char utf8[256][4];
 };
 
+#define AS_UNKNOWN_ENCODING(enc)  ((const struct unknown_encoding *) (enc))
+
 int
 XmlSizeOfUnknownEncoding(void)
 {
@@ -1238,8 +1242,8 @@
 static int
 unknown_isName(const ENCODING *enc, const char *p)
 {
-  int c = ((const struct unknown_encoding *)enc)
-          ->convert(((const struct unknown_encoding *)enc)->userData, p);
+  const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
+  int c = uenc->convert(uenc->userData, p);
   if (c & ~0xFFFF)
     return 0;
   return UCS2_GET_NAMING(namePages, c >> 8, c & 0xFF);
@@ -1248,8 +1252,8 @@
 static int
 unknown_isNmstrt(const ENCODING *enc, const char *p)
 {
-  int c = ((const struct unknown_encoding *)enc)
-          ->convert(((const struct unknown_encoding *)enc)->userData, p);
+  const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
+  int c = uenc->convert(uenc->userData, p);
   if (c & ~0xFFFF)
     return 0;
   return UCS2_GET_NAMING(nmstrtPages, c >> 8, c & 0xFF);
@@ -1258,8 +1262,8 @@
 static int
 unknown_isInvalid(const ENCODING *enc, const char *p)
 {
-  int c = ((const struct unknown_encoding *)enc)
-           ->convert(((const struct unknown_encoding *)enc)->userData, p);
+  const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
+  int c = uenc->convert(uenc->userData, p);
   return (c & ~0xFFFF) || checkCharRefNumber(c) < 0;
 }
 
@@ -1268,24 +1272,23 @@
                const char **fromP, const char *fromLim,
                char **toP, const char *toLim)
 {
+  const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
   char buf[XML_UTF8_ENCODE_MAX];
   for (;;) {
     const char *utf8;
     int n;
     if (*fromP == fromLim)
       break;
-    utf8 = ((const struct unknown_encoding *)enc)->utf8[(unsigned char)**fromP];
+    utf8 = uenc->utf8[(unsigned char)**fromP];
     n = *utf8++;
     if (n == 0) {
-      int c = ((const struct unknown_encoding *)enc)
-              ->convert(((const struct unknown_encoding *)enc)->userData,
-                        *fromP);
+      int c = uenc->convert(uenc->userData, *fromP);
       n = XmlUtf8Encode(c, buf);
       if (n > toLim - *toP)
         break;
       utf8 = buf;
-      *fromP += ((const struct normal_encoding *)enc)->type[(unsigned char)**fromP]
-                 - (BT_LEAD2 - 2);
+      *fromP += (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP]
+                 - (BT_LEAD2 - 2));
     }
     else {
       if (n > toLim - *toP)
@@ -1303,14 +1306,14 @@
                 const char **fromP, const char *fromLim,
                 unsigned short **toP, const unsigned short *toLim)
 {
+  const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc);
   while (*fromP != fromLim && *toP != toLim) {
-    unsigned short c
-      = ((const struct unknown_encoding *)enc)->utf16[(unsigned char)**fromP];
+    unsigned short c = uenc->utf16[(unsigned char)**fromP];
     if (c == 0) {
-      c = (unsigned short)((const struct unknown_encoding *)enc)
-           ->convert(((const struct unknown_encoding *)enc)->userData, *fromP);
-      *fromP += ((const struct normal_encoding *)enc)->type[(unsigned char)**fromP]
-                 - (BT_LEAD2 - 2);
+      c = (unsigned short)
+          uenc->convert(uenc->userData, *fromP);
+      *fromP += (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP]
+                 - (BT_LEAD2 - 2));
     }
     else
       (*fromP)++;

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmltok_impl.c	1 Jul 2002 16:46:08 -0000	1.4
+++ xmltok_impl.c	25 Jul 2002 14:51:19 -0000	1.5
@@ -87,8 +87,8 @@
 /* ptr points to character following " 1) {
@@ -1520,7 +1521,9 @@
   /* skip &# */
   ptr += 2*MINBPC(enc);
   if (CHAR_MATCHES(enc, ptr, ASCII_x)) {
-    for (ptr += MINBPC(enc); !CHAR_MATCHES(enc, ptr, ASCII_SEMI); ptr += MINBPC(enc)) {
+    for (ptr += MINBPC(enc);
+         !CHAR_MATCHES(enc, ptr, ASCII_SEMI);
+         ptr += MINBPC(enc)) {
       int c = BYTE_TO_ASCII(enc, ptr);
       switch (c) {
       case ASCII_0: case ASCII_1: case ASCII_2: case ASCII_3: case ASCII_4:
@@ -1528,11 +1531,13 @@
         result <<= 4;
         result |= (c - ASCII_0);
         break;
-      case ASCII_A: case ASCII_B: case ASCII_C: case ASCII_D: case ASCII_E: case ASCII_F:
+      case ASCII_A: case ASCII_B: case ASCII_C:
+      case ASCII_D: case ASCII_E: case ASCII_F:
         result <<= 4;
         result += 10 + (c - ASCII_A);
         break;
-      case ASCII_a: case ASCII_b: case ASCII_c: case ASCII_d: case ASCII_e: case ASCII_f:
+      case ASCII_a: case ASCII_b: case ASCII_c:
+      case ASCII_d: case ASCII_e: case ASCII_f:
         result <<= 4;
         result += 10 + (c - ASCII_a);
         break;




From fdrake@users.sourceforge.net  Thu Jul 25 09:22:01 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Thu Jul 25 08:22:01 2002
Subject: [Expat-checkins] expat make-release.sh,1.3,1.4
Message-ID: 

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv14052

Modified Files:
	make-release.sh 
Log Message:
When creating a tarball from the HEAD instead of a release tag, use
the date to generate the filename instead of the Expat version
number.  This makes sense since the resulting tarball does not
represent a versioned release.


Index: make-release.sh
===================================================================
RCS file: /cvsroot/expat/expat/make-release.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make-release.sh	13 Jun 2002 18:12:19 -0000	1.3
+++ make-release.sh	25 Jul 2002 15:21:06 -0000	1.4
@@ -32,7 +32,11 @@
 echo ""
 echo "Release version: $vsn"
 
-distdir=expat-$vsn
+if test "$1" = HEAD ; then
+    distdir=expat-`date '+%Y-%m-%d'`
+else
+    distdir=expat-$vsn
+fi
 if test -e $distdir; then
   echo "ERROR: for safety, you must manually remove $distdir."
   rm -rf $tmpdir




From kwaclaw@users.sourceforge.net  Sat Jul 27 10:14:04 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 27 09:14:04 2002
Subject: [Expat-checkins] expat/bcb5 ExpatGroup.bpg,1.1,1.2 elements.bpf,1.1,1.2 elements.bpr,1.2,1.3 elements.mak,1.2,1.3 makefile.mak,1.1,1.2 outline.bpf,1.1,1.2 outline.bpr,1.2,1.3 outline.mak,1.2,1.3 xmlwf.bpf,1.2,1.3 xmlwf.bpr,1.3,1.4 xmlwf.mak,1.3,1.4
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv19564

Modified Files:
	ExpatGroup.bpg elements.bpf elements.bpr elements.mak 
	makefile.mak outline.bpf outline.bpr outline.mak xmlwf.bpf 
	xmlwf.bpr xmlwf.mak 
Log Message:
Applied patch # 581069

Index: ExpatGroup.bpg
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/ExpatGroup.bpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ExpatGroup.bpg	12 Jul 2002 02:46:22 -0000	1.1
+++ ExpatGroup.bpg	27 Jul 2002 16:13:51 -0000	1.2
@@ -9,8 +9,7 @@
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = setup expat.dll expatw.dll elements.exe outline.exe gennmtab.exe \
-  xmlwf.exe
+PROJECTS = setup libexpat.dll libexpatw.dll elements.exe outline.exe xmlwf.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -19,14 +18,6 @@
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-expat.dll: expat.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-expatw.dll: expatw.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
 outline.exe: outline.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
@@ -38,7 +29,11 @@
 setup: setup.bat
   call $**
 
-gennmtab.exe: gennmtab.bpr
+libexpat.dll: libexpat.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libexpatw.dll: libexpatw.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 

Index: elements.bpf
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.bpf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- elements.bpf	12 Jul 2002 02:46:22 -0000	1.1
+++ elements.bpf	27 Jul 2002 16:13:51 -0000	1.2
@@ -1,3 +1,3 @@
-USEUNIT("..\Source\examples\elements.c");
+USEUNIT("..\examples\elements.c");
 //---------------------------------------------------------------------------
 #define WinMain

Index: elements.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.bpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elements.bpr	12 Jul 2002 05:17:26 -0000	1.2
+++ elements.bpr	27 Jul 2002 16:13:51 -0000	1.3
@@ -17,7 +17,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    
+    
     
     
     
@@ -27,8 +27,8 @@
     
     
     
-    
-    
+    
+    
     
   
   

Index: elements.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elements.mak	12 Jul 2002 05:17:26 -0000	1.2
+++ elements.mak	27 Jul 2002 16:13:51 -0000	1.3
@@ -29,7 +29,7 @@
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\examples
+PATHCPP = .;..\examples
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -37,8 +37,8 @@
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
 SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\examples;debug
+INCLUDEPATH = $(BCB)\include;..\examples;..\lib
+LIBPATH = $(BCB)\lib;..\examples;debug
 WARNINGS= -w-par -w-8027 -w-8026
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c

Index: makefile.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/makefile.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- makefile.mak	12 Jul 2002 02:46:22 -0000	1.1
+++ makefile.mak	27 Jul 2002 16:13:51 -0000	1.2
@@ -1,19 +1,16 @@
-all: setup expat expatw elements gennmtab outline xmlwf
+all: setup expat expatw elements outline xmlwf
 
 setup:
  setup
 
 expat:
- make -f expat.mak
+ make -f libexpat.mak
 
 expatw:
- make -f expatw.mak
+ make -f libexpatw.mak
 
 elements:
  make -f elements.mak
-
-gennmtab:
- make -f gennmtab.mak
 
 outline:
  make -f outline.mak

Index: outline.bpf
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/outline.bpf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- outline.bpf	12 Jul 2002 02:46:22 -0000	1.1
+++ outline.bpf	27 Jul 2002 16:13:51 -0000	1.2
@@ -1,3 +1,3 @@
-USEUNIT("..\Source\examples\outline.c");
+USEUNIT("..\examples\outline.c");
 //---------------------------------------------------------------------------
 #define WinMain

Index: outline.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/outline.bpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- outline.bpr	12 Jul 2002 05:17:26 -0000	1.2
+++ outline.bpr	27 Jul 2002 16:13:51 -0000	1.3
@@ -17,7 +17,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    
+    
     
     
     
@@ -27,8 +27,8 @@
     
     
     
-    
-    
+    
+    
     
   
   

Index: outline.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/outline.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- outline.mak	12 Jul 2002 05:17:26 -0000	1.2
+++ outline.mak	27 Jul 2002 16:13:51 -0000	1.3
@@ -29,7 +29,7 @@
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\examples
+PATHCPP = .;..\examples
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -37,8 +37,8 @@
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
 SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\examples;debug
+INCLUDEPATH = $(BCB)\include;..\examples;..\lib
+LIBPATH = $(BCB)\lib;..\examples;debug
 WARNINGS= -w-par -w-8027 -w-8026
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c

Index: xmlwf.bpf
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.bpf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmlwf.bpf	12 Jul 2002 15:07:30 -0000	1.2
+++ xmlwf.bpf	27 Jul 2002 16:13:51 -0000	1.3
@@ -1,6 +1,6 @@
-USEUNIT("..\Source\xmlwf\xmlfile.c");
-USEUNIT("..\Source\xmlwf\win32filemap.c");
-USEUNIT("..\Source\xmlwf\codepage.c");
-USEUNIT("..\Source\xmlwf\xmlwf.c");
+USEUNIT("..\xmlwf\xmlfile.c");
+USEUNIT("..\xmlwf\win32filemap.c");
+USEUNIT("..\xmlwf\codepage.c");
+USEUNIT("..\xmlwf\xmlwf.c");
 //---------------------------------------------------------------------------
 #define WinMain

Index: xmlwf.bpr
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.bpr,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmlwf.bpr	12 Jul 2002 15:07:30 -0000	1.3
+++ xmlwf.bpr	27 Jul 2002 16:13:51 -0000	1.4
@@ -4,8 +4,8 @@
   
     
     
-    
+    
     
     
     
@@ -18,7 +18,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    
+    
     
     
     
@@ -28,8 +28,8 @@
     
     
     
-    
-    
+    
+    
     
   
   

Index: xmlwf.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/xmlwf.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmlwf.mak	12 Jul 2002 15:07:30 -0000	1.3
+++ xmlwf.mak	27 Jul 2002 16:13:51 -0000	1.4
@@ -14,8 +14,8 @@
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
 PROJECT = debug\xmlwf.exe
-OBJFILES = debug\obj\xmlfile.obj debug\obj\win32filemap.obj \
-    debug\obj\codepage.obj debug\obj\xmlwf.obj
+OBJFILES = debug\obj\xmlfile.obj debug\obj\win32filemap.obj debug\obj\codepage.obj \
+    debug\obj\xmlwf.obj
 RESFILES = 
 MAINSOURCE = xmlwf.bpf
 RESDEPEN = $(RESFILES)
@@ -30,7 +30,7 @@
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\xmlwf
+PATHCPP = .;..\xmlwf
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -38,8 +38,8 @@
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\xmlwf;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\xmlwf;debug
+INCLUDEPATH = $(BCB)\include;..\xmlwf;..\lib
+LIBPATH = $(BCB)\lib;..\xmlwf;debug
 WARNINGS= -w-8065 -w-par -w-8027 -w-8026 -w-csu
 # ---------------------------------------------------------------------------
 CFLAG1 = -O2 -X- -a8 -5 -b -k -vi -q -I..\lib -c




From kwaclaw@users.sourceforge.net  Sat Jul 27 10:22:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 27 09:22:02 2002
Subject: [Expat-checkins] expat/bcb5 libexpat.bpf,NONE,1.1 libexpat.bpr,NONE,1.1 libexpat.mak,NONE,1.1 libexpatw.bpf,NONE,1.1 libexpatw.bpr,NONE,1.1 libexpatw.mak,NONE,1.1 expat.bpf,1.1,NONE expat.bpr,1.2,NONE expat.mak,1.2,NONE expatw.bpf,1.1,NONE expatw.bpr,1.2,NONE expatw.mak,1.2,NONE gennmtab.bpf,1.1,NONE gennmtab.bpr,1.2,NONE gennmtab.mak,1.2,NONE
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv20831

Added Files:
	libexpat.bpf libexpat.bpr libexpat.mak libexpatw.bpf 
	libexpatw.bpr libexpatw.mak 
Removed Files:
	expat.bpf expat.bpr expat.mak expatw.bpf expatw.bpr expatw.mak 
	gennmtab.bpf gennmtab.bpr gennmtab.mak 
Log Message:
Applied patch # 581069

--- NEW FILE: libexpat.bpf ---
USEUNIT("..\lib\xmltok.c");
USEUNIT("..\lib\xmlrole.c");
USEUNIT("..\lib\xmlparse.c");
//---------------------------------------------------------------------------
#define DllEntryPoint

--- NEW FILE: libexpat.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=7
Item0=$(BCB)\include;..\Source\lib
Item1=..\Source\lib;$(BCB)\include
Item2=..\Source\lib;..\lib;$(BCB)\include
Item3=..\lib;$(BCB)\include
Item4=..\..\..\lib;$(BCB)\include
Item5=$(BCB)\include
Item6=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=..\Source\lib;$(BCB)\lib
Item1=$(BCB)\lib
Item2=$(BCB)\lib;..\Source\lib
Item3=..\Source\lib
Item4=..\Source\lib;..\lib;$(BCB)\lib;..\lib\$(RELEASELIBPATH)
Item5=..\lib;$(BCB)\lib;..\lib\$(RELEASELIBPATH)
Item6=..\..\..\lib;$(BCB)\lib;..\..\..\lib\$(RELEASELIBPATH)
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=6
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\lib\Release
Item5=Release

[HistoryLists\hlFinalOutputDir]
Count=6
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\lib\Release\
Item4=..\..\..\lib\Release
Item5=Release\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  


--- NEW FILE: libexpat.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\libexpat.dll
OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
RESFILES = 
MAINSOURCE = libexpat.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\lib
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;COMPILED_FROM_DSP;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\lib
LIBPATH = ..\lib;$(BCB)\lib
WARNINGS= -w-rch -w-par -w-ccc
# ---------------------------------------------------------------------------
CFLAG1 = -WD -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -tWM -c -tWD
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -aa -Tpd -x -Gn -Gi -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0d32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- NEW FILE: libexpatw.bpf ---
USEUNIT("..\lib\xmltok.c");
USEUNIT("..\lib\xmlrole.c");
USEUNIT("..\lib\xmlparse.c");
//---------------------------------------------------------------------------
#define DllEntryPoint

--- NEW FILE: libexpatw.bpr ---



  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
    
    
    
    
    
  
  
    
    
    
  
  
[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1033
CodePage=1252

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[HistoryLists\hlIncludePath]
Count=6
Item0=$(BCB)\include;..\Source\lib
Item1=..\Source\lib;..\lib;$(BCB)\include
Item2=..\lib;$(BCB)\include
Item3=..\..\..\lib;$(BCB)\include
Item4=$(BCB)\include
Item5=$(BCB)\include;$(BCB)\include\mfc;$(BCB)\include\atl;

[HistoryLists\hlLibraryPath]
Count=9
Item0=$(BCB)\lib;..\Source\lib
Item1=..\Source\lib;$(BCB)\lib
Item2=$(BCB)\lib
Item3=..\Source\lib;..\lib;$(BCB)\lib
Item4=..\lib;$(BCB)\lib
Item5=..\..\..\lib;$(BCB)\lib
Item6=..\..\..\lib;$(BCB)\lib;..\..\..\lib\$(RELEASELIBPATH)
Item7=$(BCB)\lib;$(RELEASELIBPATH)
Item8=$(BCB)\lib;$(RELEASELIBPATH);;$(BCB)\lib\psdk;

[HistoryLists\hlDebugSourcePath]
Count=1
Item0=$(BCB)\source\vcl

[HistoryLists\hlConditionals]
Count=1
Item0=NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG

[HistoryLists\hlIntOutputDir]
Count=7
Item0=debug\obj
Item1=..\..\win32\debug\obj
Item2=..\..\..\..\win32\debug\obj
Item3=..\..\..\..\win32\debug
Item4=..\..\..\..\win32\release
Item5=..\..\..\lib\Release-w
Item6=Release-w

[HistoryLists\hlFinalOutputDir]
Count=7
Item0=debug\
Item1=..\..\..\..\win32\debug\
Item2=..\..\..\..\win32\debug
Item3=..\..\..\..\win32\release\
Item4=..\..\..\..\win32\release
Item5=..\..\..\lib\Release-w\
Item6=Release-w\

[Debugging]
DebugSourceDirs=

[Parameters]
RunParams=
HostApplication=
RemoteHost=
RemotePath=
RemoteDebug=0

[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
LinkCGLIB=0

[Language]
ActiveLang=
ProjectLang=
RootDir=
  


--- NEW FILE: libexpatw.mak ---
# ---------------------------------------------------------------------------
!if !$d(BCB)
BCB = $(MAKEDIR)\..
!endif

# ---------------------------------------------------------------------------
# IDE SECTION
# ---------------------------------------------------------------------------
# The following section of the project makefile is managed by the BCB IDE.
# It is recommended to use the IDE to change any of the values in this
# section.
# ---------------------------------------------------------------------------

VERSION = BCB.05.03
# ---------------------------------------------------------------------------
PROJECT = debug\libexpatw.dll
OBJFILES = debug\obj\xmltok.obj debug\obj\xmlrole.obj debug\obj\xmlparse.obj
RESFILES = 
MAINSOURCE = libexpatw.bpf
RESDEPEN = $(RESFILES)
LIBFILES = 
IDLFILES = 
IDLGENFILES = 
LIBRARIES = 
PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi \
    ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi \
    VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi \
    dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi
SPARELIBS = 
DEFFILE = 
# ---------------------------------------------------------------------------
PATHCPP = .;..\lib
PATHASM = .;
PATHPAS = .;
PATHRC = .;
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
USERDEFINES = NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;EXPAT_EXPORTS;XML_UNICODE_WCHAR_T;_DEBUG
SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
INCLUDEPATH = $(BCB)\include;..\lib
LIBPATH = $(BCB)\lib;..\lib
WARNINGS= -w-rch -w-par -w-8027 -w-8026 -w-ccc
# ---------------------------------------------------------------------------
CFLAG1 = -WD -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -tWM -c -tWD
IDLCFLAGS = -I$(BCB)\include
PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
AFLAGS = /mx /w2 /zi
LFLAGS = -Idebug\obj -D"" -aa -Tpd -x -Gn -Gi -w -v -q
# ---------------------------------------------------------------------------
ALLOBJ = c0d32.obj $(OBJFILES)
ALLRES = $(RESFILES)
ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib
# ---------------------------------------------------------------------------
!ifdef IDEOPTIONS

[Version Info]
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=1
MinorVer=0
Release=0
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0

[Version Info Keys]
CompanyName=
FileDescription=
FileVersion=1.0.0.0
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.0.0.0
Comments=

[Debugging]
DebugSourceDirs=$(BCB)\source\vcl

!endif





# ---------------------------------------------------------------------------
# MAKE SECTION
# ---------------------------------------------------------------------------
# This section of the project file is not used by the BCB IDE.  It is for
# the benefit of building from the command-line using the MAKE utility.
# ---------------------------------------------------------------------------

.autodepend
# ---------------------------------------------------------------------------
!if "$(USERDEFINES)" != ""
AUSERDEFINES = -d$(USERDEFINES:;= -d)
!else
AUSERDEFINES =
!endif

!if !$d(BCC32)
BCC32 = bcc32
!endif

!if !$d(CPP32)
CPP32 = cpp32
!endif

!if !$d(DCC32)
DCC32 = dcc32
!endif

!if !$d(TASM32)
TASM32 = tasm32
!endif

!if !$d(LINKER)
LINKER = ilink32
!endif

!if !$d(BRCC32)
BRCC32 = brcc32
!endif


# ---------------------------------------------------------------------------
!if $d(PATHCPP)
.PATH.CPP = $(PATHCPP)
.PATH.C   = $(PATHCPP)
!endif

!if $d(PATHPAS)
.PATH.PAS = $(PATHPAS)
!endif

!if $d(PATHASM)
.PATH.ASM = $(PATHASM)
!endif

!if $d(PATHRC)
.PATH.RC  = $(PATHRC)
!endif
# ---------------------------------------------------------------------------
$(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE)
    $(BCB)\BIN\$(LINKER) @&&!
    $(LFLAGS) -L$(LIBPATH) +
    $(ALLOBJ), +
    $(PROJECT),, +
    $(ALLLIB), +
    $(DEFFILE), +
    $(ALLRES)
!
# ---------------------------------------------------------------------------
.pas.hpp:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.pas.obj:
    $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< }

.cpp.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.obj:
    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }

.c.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.cpp.i:
    $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< }

.asm.obj:
    $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@

.rc.res:
    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
# ---------------------------------------------------------------------------





--- expat.bpf DELETED ---

--- expat.bpr DELETED ---

--- expat.mak DELETED ---

--- expatw.bpf DELETED ---

--- expatw.bpr DELETED ---

--- expatw.mak DELETED ---

--- gennmtab.bpf DELETED ---

--- gennmtab.bpr DELETED ---

--- gennmtab.mak DELETED ---




From kwaclaw@users.sourceforge.net  Sat Jul 27 11:49:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 27 10:49:02 2002
Subject: [Expat-checkins] expat/bcb5 ReadMe.txt,NONE,1.1
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv5682

Added Files:
	ReadMe.txt 
Log Message:
Added ReadMe file for using the free BCC32 command line compiler.

--- NEW FILE: ReadMe.txt ---

             Using the free BCC32 command line compiler

After downloading and installing the free C++ Builder commandline version,
perform the following steps (assuming it was installed under C:\Borland\BCC55):

1) Add "C:\Borland\BCC55\BIN" to your path
2) Set the environment variable BCB to "C:\Borland\BCC55".
3) edit makefile.mak: enable or comment out the appropriate commands
   under clean & distclean, depending on whether your OS can use
   deltree /y or del /s/f/q.

After that, you should simply cd to the bcb5 directory in your
Expat directory tree (same structure as CVS) and run "make all".




From kwaclaw@users.sourceforge.net  Sat Jul 27 11:51:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 27 10:51:02 2002
Subject: [Expat-checkins] expat/bcb5 elements.mak,1.3,1.4 makefile.mak,1.2,1.3
Message-ID: 

Update of /cvsroot/expat/expat/bcb5
In directory usw-pr-cvs1:/tmp/cvs-serv6108

Modified Files:
	elements.mak makefile.mak 
Log Message:
Fixes to make it work with make & the free BCC32 command line compiler:
- enabled long command arguments with the "-l" option in makefile.mak
- removed an erroneous linker option from elements.mak

Index: elements.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/elements.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- elements.mak	27 Jul 2002 16:13:51 -0000	1.3
+++ elements.mak	27 Jul 2002 17:50:45 -0000	1.4
@@ -46,7 +46,7 @@
 PFLAGS = -N2debug\obj -N0debug\obj -$YD -$W -$O-
 RFLAGS = /l 0x409 /d "NDEBUG" /i$(BCB)\include;$(BCB)\include\mfc
 AFLAGS = /mx /w2 /zi
-LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q -L..\LIB\RELEASE
+LFLAGS = -Idebug\obj -D"" -ap -Tpe -x -Gn -v -q
 # ---------------------------------------------------------------------------
 ALLOBJ = c0x32.obj $(OBJFILES)
 ALLRES = $(RESFILES)

Index: makefile.mak
===================================================================
RCS file: /cvsroot/expat/expat/bcb5/makefile.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- makefile.mak	27 Jul 2002 16:13:51 -0000	1.2
+++ makefile.mak	27 Jul 2002 17:50:45 -0000	1.3
@@ -4,22 +4,28 @@
  setup
 
 expat:
- make -f libexpat.mak
+ make -l -flibexpat.mak
 
 expatw:
- make -f libexpatw.mak
+ make -l -flibexpatw.mak
 
 elements:
- make -f elements.mak
+ make -l -felements.mak
 
 outline:
- make -f outline.mak
+ make -l -foutline.mak
 
 xmlwf:
- make -f xmlwf.mak
+ make -l -fxmlwf.mak
 
 clean:
- deltree /y debug\obj
+# works on Win98/ME
+# deltree /y debug\obj
+# works on WinNT/2000
+ del /s/f/q debug\obj
 
 distclean:
- deltree /y debug\*.*
+# works on Win98/ME
+# deltree /y debug\*.*
+# works on WinNT/2000
+ del /s/f/q debug\*




From kwaclaw@users.sourceforge.net  Sat Jul 27 17:14:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sat Jul 27 16:14:02 2002
Subject: [Expat-checkins] expat/doc reference.html,1.13,1.14
Message-ID: 

Update of /cvsroot/expat/expat/doc
In directory usw-pr-cvs1:/tmp/cvs-serv6909

Modified Files:
	reference.html 
Log Message:
Added documentation to prevent the misunderstanding that led
to bug #580503: user called parsing functions recursively.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- reference.html	11 Jul 2002 03:35:42 -0000	1.13
+++ reference.html	27 Jul 2002 23:13:16 -0000	1.14
@@ -638,7 +638,12 @@

            Parsing

            - +

            To state the obvious: the three parsing functions XML_Parse, +XML_ParseBuffer and XML_GetBuffer must not be called +from within a handler unless they operate on a separate parser instance, that is, +one that did not call the handler. For example, it is OK to call the parsing +functions from within an XML_ExternalEntityRefHandler, if they +apply to the parser created by XML_ExternalEntityParserCreate.

             int




From kwaclaw@users.sourceforge.net  Sun Jul 28 19:06:02 2002
From: kwaclaw@users.sourceforge.net (kwaclaw@users.sourceforge.net)
Date: Sun Jul 28 18:06:02 2002
Subject: [Expat-checkins] expat/lib xmltok.c,1.21,1.22
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1580

Modified Files:
	xmltok.c 
Log Message:
Applied patch for bug #434664: utf8_toutf16 infinite loop.

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- xmltok.c	25 Jul 2002 14:51:19 -0000	1.21
+++ xmltok.c	29 Jul 2002 01:05:11 -0000	1.22
@@ -343,7 +343,7 @@
       {
         unsigned long n;
         if (to + 1 == toLim)
-          break;
+          goto after;
         n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12)
             | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f);
         n -= 0x10000;
@@ -358,6 +358,7 @@
       break;
     }
   }
+after:
   *fromP = from;
   *toP = to;
 }




From fdrake@users.sourceforge.net  Wed Jul 31 05:53:03 2002
From: fdrake@users.sourceforge.net (fdrake@users.sourceforge.net)
Date: Wed Jul 31 04:53:03 2002
Subject: [Expat-checkins] CVSROOT syncmail,1.5,1.6
Message-ID: 

Update of /cvsroot/expat/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv11021

Modified Files:
	syncmail 
Log Message:
Update to the latest version.

Index: syncmail
===================================================================
RCS file: /cvsroot/expat/CVSROOT/syncmail,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- syncmail	9 May 2002 12:11:57 -0000	1.5
+++ syncmail	31 Jul 2002 11:52:45 -0000	1.6
@@ -47,6 +47,10 @@
     -u
         Produce a unified diff (smaller).
 
+    -S TEXT
+    --subject-prefix=TEXT
+        Preprend TEXT to the email subject line.
+
     --quiet / -q
         Don't print as much status to stdout.
 
@@ -71,6 +75,8 @@
     email-addrs
         At least one email address.
 """
+__version__ = '1.2'
+
 import os
 import sys
 import re
@@ -220,18 +226,22 @@
         conn = smtplib.SMTP()
         conn.connect(MAILHOST, MAILPORT)
         user = pwd.getpwuid(os.getuid())[0]
+        name = string.split(pwd.getpwuid(os.getuid())[4], ',')[0]
         domain = fromhost or getfqdn()
-        author = '%s@%s' % (user, domain)
+        address = '%s@%s' % (user, domain)
         s = StringIO()
         sys.stdout = s
         try:
             print '''\
-From: %(author)s
+From: "%(name)s" <%(address)s>
 To: %(people)s
 Subject: %(subject)s
-''' % {'author' : author,
-       'people' : string.join(people, COMMASPACE),
-       'subject': subject,
+X-Mailer: Python syncmail %(version)s 
+''' % {'address' : address,
+       'name'    : name,
+       'people'  : string.join(people, COMMASPACE),
+       'subject' : subject,
+       'version' : __version__,
        }
             s.write(sys.stdin.read())
             # append the diffs if available
@@ -240,7 +250,7 @@
                 print calculate_diff(file, contextlines)
         finally:
             sys.stdout = sys.__stdout__
-        resp = conn.sendmail(author, people, s.getvalue())
+        resp = conn.sendmail(address, people, s.getvalue())
         conn.close()
         os._exit(0)
 
@@ -250,14 +260,16 @@
 def main():
     try:
         opts, args = getopt.getopt(
-            sys.argv[1:], 'hC:cuqf:',
-            ['fromhost=', 'context=', 'cvsroot=', 'help', 'quiet'])
+            sys.argv[1:], 'hC:cuS:qf:',
+            ['fromhost=', 'context=', 'cvsroot=', 'subject-prefix=',
+             'help', 'quiet'])
     except getopt.error, msg:
         usage(1, msg)
 
     # parse the options
     contextlines = 2
     verbose = 1
+    subject_prefix = ""
     fromhost = None
     for opt, arg in opts:
         if opt in ('-h', '--help'):
@@ -271,6 +283,8 @@
                 contextlines = 2
         elif opt == '-u':
             contextlines = 0
+        elif opt in ('-S', '--subject-prefix'):
+            subject_prefix = arg
         elif opt in ('-q', '--quiet'):
             verbose = 0
         elif opt in ('-f', '--fromhost'):
@@ -282,7 +296,7 @@
     # $CVSROOT, followed by the list of files that are changing.
     if not args:
         usage(1, 'No CVS module specified')
-    subject = args[0]
+    subject = subject_prefix + args[0]
     specs = string.split(args[0])
     del args[0]
 
@@ -296,7 +310,7 @@
     if verbose:
         print 'Mailing %s...' % string.join(people, COMMASPACE)
 
-    if specs == ['-', 'Imported', 'sources']:
+    if specs[-3:] == ['-', 'Imported', 'sources']:
         return
     if specs[-3:] == ['-', 'New', 'directory']:
         del specs[-3:]




From fdrake@users.sourceforge.net  Wed Jul 31 16:11:05 2002
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed Jul 31 15:11:05 2002
Subject: [Expat-checkins] expat/lib expat.h,1.28,1.29
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20847

Modified Files:
	expat.h 
Log Message:
Add definitions to support Boolean values in the Expat API.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- expat.h	15 Jul 2002 19:57:34 -0000	1.28
+++ expat.h	31 Jul 2002 22:10:42 -0000	1.29
@@ -47,6 +47,11 @@
 typedef char XML_LChar;
 #endif /* XML_UNICODE */
 
+/* Should this be defined using stdbool.h when C99 is available? */
+typedef unsigned char XML_Bool;
+#define XML_TRUE   ((XML_Bool) 1)
+#define XML_FALSE  ((XML_Bool) 0)
+
 enum XML_Content_Type {
   XML_CTYPE_EMPTY = 1,
   XML_CTYPE_ANY,
@@ -265,6 +270,9 @@
    non-NULL. The publicId argument will be NULL unless a public
    identifier was provided. The notationName argument will have a
    non-NULL value only for unparsed entity declarations.
+
+   Note that is_parameter_entity can't be changed to XML_Bool, since
+   that would break binary compatibility.
 */
 typedef void (*XML_EntityDeclHandler) (void *userData,
                                        const XML_Char *entityName,




From fdrake@users.sourceforge.net  Wed Jul 31 16:12:03 2002
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed Jul 31 15:12:03 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.56,1.57
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21155

Modified Files:
	xmlparse.c 
Log Message:
Use the new Boolean definitions internally.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- xmlparse.c	25 Jul 2002 14:47:45 -0000	1.56
+++ xmlparse.c	31 Jul 2002 22:11:50 -0000	1.57
@@ -161,9 +161,9 @@
   const XML_Char *base;
   const XML_Char *publicId;
   const XML_Char *notation;
-  char open;
-  char is_param;
-  char is_internal;  /* true if declared in internal subset outside any PE */
+  XML_Bool open;
+  XML_Bool is_param;
+  XML_Bool is_internal; /* true if declared in internal subset outside any PE */
 } ENTITY;
 
 typedef struct {
@@ -194,17 +194,17 @@
 } STRING_POOL;
 
 /* The XML_Char before the name is used to determine whether
-an attribute has been specified. */
+   an attribute has been specified. */
 typedef struct attribute_id {
   XML_Char *name;
   PREFIX *prefix;
-  char maybeTokenized;
-  char xmlns;
+  XML_Bool maybeTokenized;
+  XML_Bool xmlns;
 } ATTRIBUTE_ID;
 
 typedef struct {
   const ATTRIBUTE_ID *id;
-  char isCdata;
+  XML_Bool isCdata;
   const XML_Char *value;
 } DEFAULT_ATTRIBUTE;
 
@@ -225,18 +225,18 @@
   STRING_POOL pool;
   STRING_POOL entityValuePool;
   /* false once a parameter entity reference has been skipped */
-  char keepProcessing;
+  XML_Bool keepProcessing;
   /* indicates if external PE has been read */
-  char paramEntityRead;
+  XML_Bool paramEntityRead;
   /* true once an internal or external PE has been read */
-  char hasParamEntities;
-  char standalone;
+  XML_Bool hasParamEntities;
+  XML_Bool standalone;
 #ifdef XML_DTD
   HASH_TABLE paramEntities;
 #endif /* XML_DTD */
   PREFIX defaultPrefix;
   /* === scaffolding for building content model === */
-  char in_eldecl;
+  XML_Bool in_eldecl;
   CONTENT_SCAFFOLD *scaffold;
   unsigned contentStringLen;
   unsigned scaffSize;
@@ -307,14 +307,14 @@
 
 static int
 defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *,
-                int isCdata, int isId, const XML_Char *dfltValue,
+                XML_Bool isCdata, XML_Bool isId, const XML_Char *dfltValue,
                 XML_Parser parser);
 
 static enum XML_Error
-storeAttributeValue(XML_Parser parser, const ENCODING *, int isCdata,
+storeAttributeValue(XML_Parser parser, const ENCODING *, XML_Bool isCdata,
                     const char *, const char *, STRING_POOL *);
 static enum XML_Error
-appendAttributeValue(XML_Parser parser, const ENCODING *, int isCdata,
+appendAttributeValue(XML_Parser parser, const ENCODING *, XML_Bool isCdata,
                      const char *, const char *, STRING_POOL *);
 static ATTRIBUTE_ID *
 getAttributeId(XML_Parser parser, const ENCODING *enc, const char *start,
@@ -461,8 +461,8 @@
   const XML_Char *m_declNotationPublicId;
   ELEMENT_TYPE *m_declElementType;
   ATTRIBUTE_ID *m_declAttributeId;
-  char m_declAttributeIsCdata;
-  char m_declAttributeIsId;
+  XML_Bool m_declAttributeIsCdata;
+  XML_Bool m_declAttributeIsId;
   DTD m_dtd;
   const XML_Char *m_curBase;
   TAG *m_tagStack;
@@ -481,7 +481,7 @@
   XML_Char m_namespaceSeparator;
   XML_Parser m_parentParser;
 #ifdef XML_DTD
-  int m_isParamEntity;
+  XML_Bool m_isParamEntity;
   enum XML_ParamEntityParsing m_paramEntityParsing;
 #endif
 } Parser;
@@ -742,8 +742,8 @@
   declAttributeType = NULL;
   declNotationName = NULL;
   declNotationPublicId = NULL;
-  declAttributeIsCdata = 0;
-  declAttributeIsId = 0;
+  declAttributeIsCdata = XML_FALSE;
+  declAttributeIsId = XML_FALSE;
   memset(&position, 0, sizeof(POSITION));
   errorCode = XML_ERROR_NONE;
   eventPtr = NULL;
@@ -762,7 +762,7 @@
   unknownEncodingHandlerData = NULL;
   parentParser = NULL;
 #ifdef XML_DTD
-  isParamEntity = 0;
+  isParamEntity = XML_FALSE;
   paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
 #endif
   return dtdInit(&dtd, parser);
@@ -897,7 +897,7 @@
   }
   else {
     dtdSwap(&dtd, oldDtd);
-    isParamEntity = 1;
+    isParamEntity = XML_TRUE;
     XmlPrologStateInitExternalEntity(&prologState);
     processor = externalParEntInitProcessor;
   }
@@ -1746,7 +1746,7 @@
               reportDefault(parser, enc, s, next);
             break;
           }
-          entity->open = 1;
+          entity->open = XML_TRUE;
           openEntity.next = openInternalEntities;
           openInternalEntities = &openEntity;
           openEntity.entity = entity;
@@ -1758,16 +1758,16 @@
                              (char *)entity->textPtr,
                              (char *)(entity->textPtr + entity->textLen),
                              0);
-          entity->open = 0;
+          entity->open = XML_FALSE;
           openInternalEntities = openEntity.next;
           if (result)
             return result;
         }
         else if (externalEntityRefHandler) {
           const XML_Char *context;
-          entity->open = 1;
+          entity->open = XML_TRUE;
           context = getContext(parser);
-          entity->open = 0;
+          entity->open = XML_FALSE;
           if (!context)
             return XML_ERROR_NO_MEMORY;
           if (!externalEntityRefHandler(externalEntityRefHandlerArg,
@@ -2163,7 +2163,7 @@
     appAtts[attIndex++] = attId->name;
     if (!atts[i].normalized) {
       enum XML_Error result;
-      int isCdata = 1;
+      XML_Bool isCdata = XML_TRUE;
 
       /* figure out whether declared as other than CDATA */
       if (attId->maybeTokenized) {
@@ -2658,7 +2658,7 @@
                            &standalone))
     return XML_ERROR_SYNTAX;
   if (!isGeneralTextEntity && standalone == 1) {
-    dtd.standalone = 1;
+    dtd.standalone = XML_TRUE;
 #ifdef XML_DTD
     if (paramEntityParsing == XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE)
       paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER;
@@ -2784,8 +2784,8 @@
 
   /* we know now that XML_Parse(Buffer) has been called,
      so we assume we actually have an external parameter entity */
-  dtd.hasParamEntities = 1;
-  dtd.paramEntityRead = 1;
+  dtd.hasParamEntities = XML_TRUE;
+  dtd.paramEntityRead = XML_TRUE;
 
   if (prologState.inEntityValue) {
     processor = entityValueInitProcessor;
@@ -3101,7 +3101,7 @@
           ENTITY *entity = (ENTITY *)lookup(&dtd.paramEntities,
                                             externalSubsetName,
                                             0);
-          dtd.paramEntityRead = 0;
+          dtd.paramEntityRead = XML_FALSE;
           if (!externalEntityRefHandler(externalEntityRefHandlerArg,
                                         0,
                                         entity->base,
@@ -3109,10 +3109,10 @@
                                         entity->publicId))
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           if (!dtd.paramEntityRead)
-            dtd.keepProcessing = 0;
+            dtd.keepProcessing = XML_FALSE;
         }
         else
-          dtd.keepProcessing = 0;
+          dtd.keepProcessing = XML_FALSE;
 #endif /* XML_DTD */
         if (dtd.paramEntityRead
             && !dtd.standalone
@@ -3135,16 +3135,16 @@
       declAttributeId = getAttributeId(parser, enc, s, next);
       if (!declAttributeId)
         return XML_ERROR_NO_MEMORY;
-      declAttributeIsCdata = 0;
+      declAttributeIsCdata = XML_FALSE;
       declAttributeType = NULL;
-      declAttributeIsId = 0;
+      declAttributeIsId = XML_FALSE;
       break;
     case XML_ROLE_ATTRIBUTE_TYPE_CDATA:
-      declAttributeIsCdata = 1;
+      declAttributeIsCdata = XML_TRUE;
       declAttributeType = atypeCDATA;
       break;
     case XML_ROLE_ATTRIBUTE_TYPE_ID:
-      declAttributeIsId = 1;
+      declAttributeIsId = XML_TRUE;
       declAttributeType = atypeID;
       break;
     case XML_ROLE_ATTRIBUTE_TYPE_IDREF:
@@ -3225,7 +3225,7 @@
         poolFinish(&dtd.pool);
         /* ID attributes aren't allowed to have a default */
         if (!defineAttribute(declElementType, declAttributeId,
-                       declAttributeIsCdata, 0, attVal, parser))
+                             declAttributeIsCdata, XML_FALSE, attVal, parser))
           return XML_ERROR_NO_MEMORY;
         if (attlistDeclHandler && declAttributeType) {
           if (*declAttributeType == XML_T('(')
@@ -3379,7 +3379,7 @@
           else {
             poolFinish(&dtd.pool);
             declEntity->publicId = NULL;
-            declEntity->is_param = 0;
+            declEntity->is_param = XML_FALSE;
             /* if we have a parent parser or are reading an internal parameter
                entity, then the entity declaration is not considered "internal"
             */
@@ -3409,7 +3409,7 @@
         else {
           poolFinish(&dtd.pool);
           declEntity->publicId = 0;
-          declEntity->is_param = 1;
+          declEntity->is_param = XML_TRUE;
           /* if we have a parent parser or are reading an internal parameter
              entity, then the entity declaration is not considered "internal"
           */
@@ -3557,7 +3557,7 @@
           role == XML_ROLE_INNER_PARAM_ENTITY_REF)
         return XML_ERROR_PARAM_ENTITY_REF;
       if (!paramEntityParsing)
-        dtd.keepProcessing = 0;
+        dtd.keepProcessing = XML_FALSE;
       else {
         const XML_Char *name;
         ENTITY *entity;
@@ -3580,7 +3580,7 @@
             return XML_ERROR_ENTITY_DECLARED_IN_PE;
         }
         else if (!entity) {
-          dtd.keepProcessing = 0;
+          dtd.keepProcessing = XML_FALSE;
           /* cannot report skipped entities in declarations */
           if ((role == XML_ROLE_PARAM_ENTITY_REF) && skippedEntityHandler)
             skippedEntityHandler(handlerArg, name, 1);
@@ -3596,19 +3596,19 @@
           break;
         }
         if (externalEntityRefHandler) {
-          dtd.paramEntityRead = 0;
-          entity->open = 1;
+          dtd.paramEntityRead = XML_FALSE;
+          entity->open = XML_TRUE;
           if (!externalEntityRefHandler(externalEntityRefHandlerArg,
                                         0,
                                         entity->base,
                                         entity->systemId,
                                         entity->publicId)) {
-            entity->open = 0;
+            entity->open = XML_FALSE;
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           }
-          entity->open = 0;
+          entity->open = XML_FALSE;
           if (!dtd.paramEntityRead) {
-            dtd.keepProcessing = 0;
+            dtd.keepProcessing = XML_FALSE;
             break;
           }
         }
@@ -3635,7 +3635,7 @@
                 return XML_ERROR_NO_MEMORY;
               dtd.scaffLevel = 0;
               dtd.scaffCount = 0;
-              dtd.in_eldecl = 1;
+              dtd.in_eldecl = XML_TRUE;
       }
       break;
 
@@ -3656,7 +3656,7 @@
           *eventEndPP = s;
           elementDeclHandler(handlerArg, declElementType->name, content);
         }
-        dtd.in_eldecl = 0;
+        dtd.in_eldecl = XML_FALSE;
       }
       break;
 
@@ -3725,7 +3725,7 @@
             *eventEndPP = s;
             elementDeclHandler(handlerArg, declElementType->name, model);
           }
-          dtd.in_eldecl = 0;
+          dtd.in_eldecl = XML_FALSE;
           dtd.contentStringLen = 0;
         }
       }
@@ -3837,7 +3837,7 @@
   int tok;
   enum XML_Error result;
   OPEN_INTERNAL_ENTITY openEntity;
-  entity->open = 1;
+  entity->open = XML_TRUE;
   openEntity.next = openInternalEntities;
   openInternalEntities = &openEntity;
   openEntity.entity = entity;
@@ -3845,10 +3845,10 @@
   openEntity.internalEventEndPtr = NULL;
   s = (char *)entity->textPtr;
   end = (char *)(entity->textPtr + entity->textLen);
-  dtd.hasParamEntities = 1;
+  dtd.hasParamEntities = XML_TRUE;
   tok = XmlPrologTok(internalEncoding, s, end, &next);
   result = doProlog(parser, internalEncoding, s, end, tok, next, 0);
-  entity->open = 0;
+  entity->open = XML_FALSE;
   openInternalEntities = openEntity.next;
   return result;
 }
@@ -3865,7 +3865,7 @@
 }
 
 static enum XML_Error
-storeAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata,
+storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
                     const char *ptr, const char *end,
                     STRING_POOL *pool)
 {
@@ -3881,7 +3881,7 @@
 }
 
 static enum XML_Error
-appendAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata,
+appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
                      const char *ptr, const char *end,
                      STRING_POOL *pool)
 {
@@ -4005,11 +4005,11 @@
         else {
           enum XML_Error result;
           const XML_Char *textEnd = entity->textPtr + entity->textLen;
-          entity->open = 1;
+          entity->open = XML_TRUE;
           result = appendAttributeValue(parser, internalEncoding, isCdata,
                                         (char *)entity->textPtr,
                                         (char *)textEnd, pool);
-          entity->open = 0;
+          entity->open = XML_FALSE;
           if (result)
             return result;
         }
@@ -4070,7 +4070,7 @@
           if (skippedEntityHandler)
             skippedEntityHandler(handlerArg, name, 0);
           */
-          dtd.keepProcessing = 0;
+          dtd.keepProcessing = XML_FALSE;
           goto endEntityValue;
         }
         if (entity->open) {
@@ -4081,30 +4081,30 @@
         }
         if (entity->systemId) {
           if (externalEntityRefHandler) {
-            dtd.paramEntityRead = 0;
-            entity->open = 1;
+            dtd.paramEntityRead = XML_FALSE;
+            entity->open = XML_TRUE;
             if (!externalEntityRefHandler(externalEntityRefHandlerArg,
                                           0,
                                           entity->base,
                                           entity->systemId,
                                           entity->publicId)) {
-              entity->open = 0;
+              entity->open = XML_FALSE;
               result = XML_ERROR_EXTERNAL_ENTITY_HANDLING;
               goto endEntityValue;
             }
-            entity->open = 0;
+            entity->open = XML_FALSE;
             if (!dtd.paramEntityRead)
-              dtd.keepProcessing = 0;
+              dtd.keepProcessing = XML_FALSE;
           }
         }
         else {
-          entity->open = 1;
+          entity->open = XML_TRUE;
           result = storeEntityValue(parser,
                                     internalEncoding,
                                     (char *)entity->textPtr,
                                     (char *)(entity->textPtr
                                              + entity->textLen));
-          entity->open = 0;
+          entity->open = XML_FALSE;
           if (result)
             goto endEntityValue;
         }
@@ -4291,8 +4291,8 @@
 
 
 static int
-defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, int isCdata,
-                int isId, const XML_Char *value, XML_Parser parser)
+defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata,
+                XML_Bool isId, const XML_Char *value, XML_Parser parser)
 {
   DEFAULT_ATTRIBUTE *att;
   if (value || isId) {
@@ -4326,9 +4326,9 @@
   att = type->defaultAtts + type->nDefaultAtts;
   att->id = attId;
   att->value = value;
-  att->isCdata = (char)isCdata;
+  att->isCdata = isCdata;
   if (!isCdata)
-    attId->maybeTokenized = 1;
+    attId->maybeTokenized = XML_TRUE;
   type->nDefaultAtts += 1;
   return 1;
 }
@@ -4393,7 +4393,7 @@
         id->prefix = &dtd.defaultPrefix;
       else
         id->prefix = (PREFIX *)lookup(&dtd.prefixes, name + 6, sizeof(PREFIX));
-      id->xmlns = 1;
+      id->xmlns = XML_TRUE;
     }
     else {
       int i;
@@ -4502,7 +4502,7 @@
         return 0;
       e = (ENTITY *)lookup(&dtd.generalEntities, poolStart(&tempPool), 0);
       if (e)
-        e->open = 1;
+        e->open = XML_TRUE;
       if (*s != XML_T('\0'))
         s++;
       context = s;
@@ -4584,17 +4584,17 @@
   hashTableInit(&(p->elementTypes), ms);
   hashTableInit(&(p->attributeIds), ms);
   hashTableInit(&(p->prefixes), ms);
-  p->keepProcessing = 1;
-  p->paramEntityRead = 0;
-  p->hasParamEntities = 0;
-  p->standalone = 0;
+  p->keepProcessing = XML_TRUE;
+  p->paramEntityRead = XML_FALSE;
+  p->hasParamEntities = XML_FALSE;
+  p->standalone = XML_FALSE;
 #ifdef XML_DTD
   hashTableInit(&(p->paramEntities), ms);
 #endif /* XML_DTD */
   p->defaultPrefix.name = NULL;
   p->defaultPrefix.binding = NULL;
 
-  p->in_eldecl = 0;
+  p->in_eldecl = XML_FALSE;
   p->scaffIndex = 0;
   p->scaffLevel = 0;
   p->scaffold = NULL;




From fdrake@users.sourceforge.net  Wed Jul 31 16:42:06 2002
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed Jul 31 15:42:06 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.57,1.58
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28797

Modified Files:
	xmlparse.c 
Log Message:
Caught some more Boolean fields in the internals.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- xmlparse.c	31 Jul 2002 22:11:50 -0000	1.57
+++ xmlparse.c	31 Jul 2002 22:41:48 -0000	1.58
@@ -437,8 +437,8 @@
   INIT_ENCODING m_initEncoding;
   const ENCODING *m_internalEncoding;
   const XML_Char *m_protocolEncodingName;
-  int m_ns;
-  int m_ns_triplets;
+  XML_Bool m_ns;
+  XML_Bool m_ns_triplets;
   void *m_unknownEncodingMem;
   void *m_unknownEncodingData;
   void *m_unknownEncodingHandlerData;
@@ -450,7 +450,7 @@
   const char *m_eventEndPtr;
   const char *m_positionPtr;
   OPEN_INTERNAL_ENTITY *m_openInternalEntities;
-  int m_defaultExpandInternalEntities;
+  XML_Bool m_defaultExpandInternalEntities;
   int m_tagLevel;
   ENTITY *m_declEntity;
   const XML_Char *m_doctypeName;
@@ -666,8 +666,8 @@
   freeTagList = NULL;
 
   namespaceSeparator = '!';
-  ns = 0;
-  ns_triplets = 0;
+  ns = XML_FALSE;
+  ns_triplets = XML_FALSE;
   poolInit(&tempPool, &(((Parser *) parser)->m_mem));
   poolInit(&temp2Pool, &(((Parser *) parser)->m_mem));
 
@@ -678,7 +678,7 @@
   }
 
   if (nameSep) {
-    ns = 1;
+    ns = XML_TRUE;
     internalEncoding = XmlGetInternalEncodingNS();
     namespaceSeparator = *nameSep;
 
@@ -750,7 +750,7 @@
   eventEndPtr = NULL;
   positionPtr = NULL;
   openInternalEntities = 0;
-  defaultExpandInternalEntities = 1;
+  defaultExpandInternalEntities = XML_TRUE;
   tagLevel = 0;
   tagStack = 0;
   nSpecifiedAtts = 0;
@@ -824,7 +824,7 @@
 
   void *oldUserData = userData;
   void *oldHandlerArg = handlerArg;
-  int oldDefaultExpandInternalEntities = defaultExpandInternalEntities;
+  XML_Bool oldDefaultExpandInternalEntities = defaultExpandInternalEntities;
   void *oldExternalEntityRefHandlerArg = externalEntityRefHandlerArg;
 #ifdef XML_DTD
   int oldParamEntityParsing = paramEntityParsing;
@@ -965,7 +965,7 @@
 
 void
 XML_SetReturnNSTriplet(XML_Parser parser, int do_nst) {
-  ns_triplets = do_nst;
+  ns_triplets = do_nst ? XML_TRUE : XML_FALSE;
 }
 
 void
@@ -1077,7 +1077,7 @@
                       XML_DefaultHandler handler)
 {
   defaultHandler = handler;
-  defaultExpandInternalEntities = 0;
+  defaultExpandInternalEntities = XML_FALSE;
 }
 
 void
@@ -1085,7 +1085,7 @@
                             XML_DefaultHandler handler)
 {
   defaultHandler = handler;
-  defaultExpandInternalEntities = 1;
+  defaultExpandInternalEntities = XML_TRUE;
 }
 
 void




From fdrake@users.sourceforge.net  Wed Jul 31 23:44:03 2002
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed Jul 31 22:44:03 2002
Subject: [Expat-checkins] expat/lib xmlparse.c,1.58,1.59
Message-ID: 

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv663

Modified Files:
	xmlparse.c 
Log Message:
doProlog():  Use NULL instead of 0 to clear pointer variables.
getContext():  The needSep local is Boolean, so declare & set it that
way.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- xmlparse.c	31 Jul 2002 22:41:48 -0000	1.58
+++ xmlparse.c	1 Aug 2002 05:42:57 -0000	1.59
@@ -3404,11 +3404,11 @@
           return XML_ERROR_NO_MEMORY;
         if (declEntity->name != name) {
           poolDiscard(&dtd.pool);
-          declEntity = 0;
+          declEntity = NULL;
         }
         else {
           poolFinish(&dtd.pool);
-          declEntity->publicId = 0;
+          declEntity->publicId = NULL;
           declEntity->is_param = XML_TRUE;
           /* if we have a parent parser or are reading an internal parameter
              entity, then the entity declaration is not considered "internal"
@@ -4426,7 +4426,7 @@
 getContext(XML_Parser parser)
 {
   HASH_TABLE_ITER iter;
-  int needSep = 0;
+  XML_Bool needSep = XML_FALSE;
 
   if (dtd.defaultPrefix.binding) {
     int i;
@@ -4439,7 +4439,7 @@
     for (i = 0; i < len; i++)
       if (!poolAppendChar(&tempPool, dtd.defaultPrefix.binding->uri[i]))
         return NULL;
-    needSep = 1;
+    needSep = XML_TRUE;
   }
 
   hashTableIterInit(&iter, &(dtd.prefixes));
@@ -4465,7 +4465,7 @@
     for (i = 0; i < len; i++)
       if (!poolAppendChar(&tempPool, prefix->binding->uri[i]))
         return NULL;
-    needSep = 1;
+    needSep = XML_TRUE;
   }
 
 
@@ -4482,7 +4482,7 @@
     for (s = e->name; *s; s++)
       if (!poolAppendChar(&tempPool, *s))
         return 0;
-    needSep = 1;
+    needSep = XML_TRUE;
   }
 
   if (!poolAppendChar(&tempPool, XML_T('\0')))