diff --git a/ChangeLog b/ChangeLog index ed6df72e..41651f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jul 21 17:09:57 CEST 2000 Daniel Veillard + + * nanohttp.c: fixed socklen_t replacement to unsigned int + * parser.c: fixed a space handdling missing at the end of + production 28 DOCTYPE. + * xmlmemory.c: fixed a stupid bug on the routine to override + allocation functions + * TODO: updated + Fri Jul 14 17:01:14 CEST 2000 Daniel Veillard * doc/ regenerated the docs diff --git a/TODO b/TODO index f9ef8ca0..7f4c144b 100644 --- a/TODO +++ b/TODO @@ -6,6 +6,8 @@ TODO: ===== +- If the internal encoding is not UTF8 saving to a given encoding doesn't + work => fix to force UTF8 encoding ... - problem when parsing hrefs with & with the HTML parser (IRC ac) - DOM needs xmlAttrPtr xmlNewDocProp(xmlDocPtr doc, const xmlChar *name, const xmlChar *value) @@ -91,9 +93,6 @@ EXTENSIONS: Done: ===== -- If the internal encoding is not UTF8 saving to a given encoding doesn't - work => fix to force UTF8 encoding ... - done, added documentation too - Add an ASCII I/O encoder (asciiToUTF8 and UTF8Toascii) - Issue warning when using non-absolute namespaces URI. - the html parser should add and if they don't exist diff --git a/encoding.c b/encoding.c index 3d997345..b12bd0bc 100644 --- a/encoding.c +++ b/encoding.c @@ -1033,8 +1033,6 @@ xmlGetCharEncodingName(xmlCharEncoding enc) { return("Shift-JIS"); case XML_CHAR_ENCODING_EUC_JP: return("EUC-JP"); - case XML_CHAR_ENCODING_ASCII: - return("ASCII"); } return(NULL); } diff --git a/nanohttp.c b/nanohttp.c index 51f1e92c..1beebbf5 100644 --- a/nanohttp.c +++ b/nanohttp.c @@ -656,7 +656,7 @@ xmlNanoHTTPConnectAttempt(struct in_addr ia, int port) } if ( FD_ISSET(s, &wfd) ) { - unsigned int len; /* was socklen_t barfed on some systems :-( */ + int len; /* was socklen_t barfed on some systems :-( */ len = sizeof(status); if (getsockopt(s, SOL_SOCKET, SO_ERROR, &status, &len) < 0 ) { /* Solaris error code */ diff --git a/parser.c b/parser.c index 1bcc7e6f..3e7834dc 100644 --- a/parser.c +++ b/parser.c @@ -2380,10 +2380,6 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc) /* let's assume it's UTF-8 without the XML decl */ ctxt->charset = XML_CHAR_ENCODING_UTF8; return(0); - case XML_CHAR_ENCODING_ASCII: - /* default encoding, no conversion should be needed */ - ctxt->charset = XML_CHAR_ENCODING_UTF8; - return(0); case XML_CHAR_ENCODING_UTF8: /* default encoding, no conversion should be needed */ ctxt->charset = XML_CHAR_ENCODING_UTF8; @@ -7348,7 +7344,10 @@ xmlParseInternalSubset(xmlParserCtxtPtr ctxt) { break; } } - if (RAW == ']') NEXT; + if (RAW == ']') { + NEXT; + SKIP_BLANKS; + } } /* diff --git a/xmlmemory.c b/xmlmemory.c index b82a6e07..1595a2a1 100644 --- a/xmlmemory.c +++ b/xmlmemory.c @@ -656,13 +656,13 @@ xmlInitMemory(void) int xmlMemSetup(xmlFreeFunc freeFunc, xmlMallocFunc mallocFunc, xmlReallocFunc reallocFunc, xmlStrdupFunc strdupFunc) { - if (freeFunc != NULL) + if (freeFunc == NULL) return(-1); - if (mallocFunc != NULL) + if (mallocFunc == NULL) return(-1); - if (reallocFunc != NULL) + if (reallocFunc == NULL) return(-1); - if (strdupFunc != NULL) + if (strdupFunc == NULL) return(-1); xmlFree = freeFunc; xmlMalloc = mallocFunc;