Commit 5bb9ccd5 authored by Daniel Veillard's avatar Daniel Veillard

remove the warning on the 2001 namespace remove some warnings when

* xinclude.c: remove the warning on the 2001 namespace
* parser.c parserInternals.c xpath.c: remove some warnings
  when compiling with MSVC6
* nanohttp.c: applied a patch when using _WINSOCKAPI_
Daniel
parent 95af594b
Mon Feb 9 13:35:50 CET 2004 Daniel Veillard <daniel@veillard.com>
* xinclude.c: remove the warning on the 2001 namespace
* parser.c parserInternals.c xpath.c: remove some warnings
when compiling with MSVC6
* nanohttp.c: applied a patch when using _WINSOCKAPI_
Sun Feb 8 12:09:55 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xinclude.c: added a small hack to fix interference between
......
......@@ -872,6 +872,9 @@ static int
xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
{
fd_set wfd;
#ifdef _WINSOCKAPI_
fd_set xfd;
#endif
struct timeval tv;
int status;
int addrlen;
......@@ -954,8 +957,15 @@ xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
FD_ZERO(&wfd);
FD_SET(s, &wfd);
#ifdef _WINSOCKAPI_
FD_ZERO(&xfd);
FD_SET(s, &xfd);
switch(select(s+1, NULL, &wfd, &xfd, &tv))
#else
switch(select(s+1, NULL, &wfd, NULL, &tv))
#endif
{
case 0:
/* Time out */
......@@ -969,7 +979,11 @@ xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
return(-1);
}
if ( FD_ISSET(s, &wfd) ) {
if ( FD_ISSET(s, &wfd)
#ifdef _WINSOCKAPI_
|| FD_ISSET(s, &xfd)
#endif
) {
SOCKLEN_T len;
len = sizeof(status);
#ifdef SO_ERROR
......
......@@ -854,7 +854,7 @@ nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL)
} else if (ctxt->nsNr >= ctxt->nsMax) {
ctxt->nsMax *= 2;
ctxt->nsTab = (const xmlChar **)
xmlRealloc(ctxt->nsTab,
xmlRealloc((char *) ctxt->nsTab,
ctxt->nsMax * sizeof(ctxt->nsTab[0]));
if (ctxt->nsTab == NULL) {
xmlErrMemory(ctxt, NULL);
......
......@@ -1686,7 +1686,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt)
if (ctxt->vctxt.nodeTab != NULL) xmlFree(ctxt->vctxt.nodeTab);
if (ctxt->atts != NULL) xmlFree((xmlChar * *)ctxt->atts);
if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
if (ctxt->nsTab != NULL) xmlFree(ctxt->nsTab);
if (ctxt->nsTab != NULL) xmlFree((char *) ctxt->nsTab);
if (ctxt->pushTab != NULL) xmlFree(ctxt->pushTab);
if (ctxt->attallocs != NULL) xmlFree(ctxt->attallocs);
if (ctxt->attsDefault != NULL)
......
......@@ -2076,9 +2076,11 @@ xmlXIncludeTestNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node) {
(xmlStrEqual(node->ns->href, XINCLUDE_OLD_NS))) {
if (xmlStrEqual(node->ns->href, XINCLUDE_OLD_NS)) {
if (ctxt->legacy == 0) {
#if 0 /* wait for the XML Core Working Group to get something stable ! */
xmlXIncludeWarn(ctxt, node, XML_XINCLUDE_DEPRECATED_NS,
"Deprecated XInclude namespace found, use %s",
XINCLUDE_NS);
#endif
ctxt->legacy = 1;
}
}
......
......@@ -8795,7 +8795,9 @@ xmlXPathCompStep(xmlXPathParserContextPtr ctxt) {
xmlGenericErrorContextNodeSet(stdout, ctxt->value->nodesetval);
#endif
#ifdef LIBXML_XPTR_ENABLED
eval_predicates:
#endif
op1 = ctxt->comp->last;
ctxt->comp->last = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment