shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-12 09:17:37 +03:00
Code

- nanohttp.c: fixed socklen_t replacement to unsigned int

Browse Source 
- 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
Daniel
This commit is contained in:
Daniel Veillard 2000-07-21 15:16:39 +00:00
parent 94e906032a
commit 3665069745
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Jul 21 17:09:57 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* 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 <Daniel.Veillard@w3.org>
* doc/ regenerated the docs

5
TODO
View File

@ -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 <head> and <body> if they don't exist

2
encoding.c
View File

@ -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);
}

2
nanohttp.c
View File

@ -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 */

9
parser.c
View File

@ -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;
}
}
/*

8
xmlmemory.c
View File

@ -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;