Commit c7e3cc49 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

another patch from Malcolm Tredinnick fixing warning generated by the

* acconfig.h config.h.in configure.in xmlIO.c xmlregexp.c xmlschemas.c
  xmlschemastypes.c: another patch from Malcolm Tredinnick fixing
  warning generated by the Nonstop Kernel Open System Services
  compiler #151710
Daniel
parent a81355ef
Tue Sep 28 13:07:37 CEST 2004 Daniel Veillard <daniel@veillard.com
Tue Sep 28 14:30:22 CEST 2004 Daniel Veillard <daniel@veillard.com>
* acconfig.h config.h.in configure.in xmlIO.c xmlregexp.c xmlschemas.c
xmlschemastypes.c: another patch from Malcolm Tredinnick fixing
warning generated by the Nonstop Kernel Open System Services
compiler #151710
Tue Sep 28 13:07:37 CEST 2004 Daniel Veillard <daniel@veillard.com>
* python/libxml.py: applied patch from Malcolm Tredinnick fixing
python exception hierarchy #139824
......
......@@ -6,7 +6,6 @@
#undef HAVE_ISNAN
#undef HAVE_LIBHISTORY
#undef HAVE_LIBREADLINE
#undef SOCKLEN_T
#undef HAVE_LIBPTHREAD
#undef HAVE_PTHREAD_H
......
......@@ -7,7 +7,6 @@
#undef HAVE_ISNAN
#undef HAVE_LIBHISTORY
#undef HAVE_LIBREADLINE
#undef SOCKLEN_T
#undef HAVE_LIBPTHREAD
#undef HAVE_PTHREAD_H
......@@ -256,7 +255,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define if compiler has function prototypes */
/* Define to 1 if the C compiler supports function prototypes. */
#undef PROTOTYPES
/* Determine what socket length (socklen_t) data type is */
......@@ -274,6 +273,9 @@
/* Using the Win32 Socket implementation */
#undef _WINSOCKAPI_
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Win32 Std C name mangling work-around */
#undef snprintf
......
......@@ -217,7 +217,7 @@ AC_TRY_COMPILE2([
AC_MSG_RESULT(int *)
SOCKLEN_T=int],[
AC_MSG_WARN(could not determine)
SOCKLEN_T="unsigned int"])])])
SOCKLEN_T="int"])])])
AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
dnl ***********************Checking for availability of IPv6*******************
......
......@@ -2217,7 +2217,9 @@ __xmlOutputBufferCreateFilename(const char *URI,
int i = 0;
void *context = NULL;
char *unescaped = NULL;
#ifdef HAVE_ZLIB_H
int is_file_uri = 1;
#endif
if (xmlOutputCallbackInitialized == 0)
xmlRegisterDefaultOutputCallbacks();
......@@ -2228,7 +2230,9 @@ __xmlOutputBufferCreateFilename(const char *URI,
if (puri != NULL) {
if ((puri->scheme != NULL) &&
(!xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file")))
#ifdef HAVE_ZLIB_H
is_file_uri = 0;
#endif
/*
* try to limit the damages of the URI unescaping code.
*/
......
......@@ -4008,11 +4008,8 @@ xmlFAParseBranch(xmlRegParserCtxtPtr ctxt) {
*/
static void
xmlFAParseRegExp(xmlRegParserCtxtPtr ctxt, int top) {
xmlRegStatePtr start, end, oldend, oldstart;
xmlRegStatePtr start, end;
oldend = ctxt->end;
oldstart = ctxt->state;
/* if not top start should have been generated by an epsilon trans */
start = ctxt->state;
ctxt->end = NULL;
......
......@@ -12534,7 +12534,6 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt)
xmlSchemaPtr ret = NULL;
xmlDocPtr doc;
xmlNodePtr root;
int nberrors;
int preserve = 0;
/*
......@@ -12547,7 +12546,6 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt)
if (ctxt == NULL)
return (NULL);
nberrors = ctxt->nberrors;
ctxt->nberrors = 0;
ctxt->counter = 0;
ctxt->container = NULL;
......@@ -12895,7 +12893,7 @@ xmlSchemaValidateFacetsInternal(xmlSchemaValidCtxtPtr ctxt,
xmlSchemaTypePtr biType; /* The build-in type. */
xmlSchemaTypePtr tmpType;
xmlSchemaFacetLinkPtr facetLink;
int retFacet, hasFacet;
int retFacet;
xmlSchemaFacetPtr facet;
unsigned long len = 0;
......@@ -12997,7 +12995,6 @@ xmlSchemaValidateFacetsInternal(xmlSchemaValidCtxtPtr ctxt,
* Process patters. Pattern facets are ORed at type level
* and ANDed if derived. Walk the base type axis.
*/
hasFacet = 0;
tmpType = type;
facet = NULL;
do {
......
......@@ -529,7 +529,7 @@ xmlSchemaIsBuiltInTypeFacet(xmlSchemaTypePtr type, int facetType)
else
return (0);
default:
return (0);
break;
}
return (0);
}
......
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