shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-05-29 17:05:36 +03:00
Code

another patch from Malcolm Tredinnick fixing warning generated by the

Browse Source 
* 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
This commit is contained in:
Daniel Veillard 2004-09-28 12:33:52 +00:00
parent a81355ef66
commit c7e3cc49ba
8 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,4 +1,11 @@
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/libxml.py: applied patch from Malcolm Tredinnick fixing
python exception hierarchy #139824 python exception hierarchy #139824

1
acconfig.h
View File

@ -6,7 +6,6 @@
#undef HAVE_ISNAN #undef HAVE_ISNAN
#undef HAVE_LIBHISTORY #undef HAVE_LIBHISTORY
#undef HAVE_LIBREADLINE #undef HAVE_LIBREADLINE
#undef SOCKLEN_T
#undef HAVE_LIBPTHREAD #undef HAVE_LIBPTHREAD
#undef HAVE_PTHREAD_H #undef HAVE_PTHREAD_H

6
config.h.in
View File

@ -7,7 +7,6 @@
#undef HAVE_ISNAN #undef HAVE_ISNAN
#undef HAVE_LIBHISTORY #undef HAVE_LIBHISTORY
#undef HAVE_LIBREADLINE #undef HAVE_LIBREADLINE
#undef SOCKLEN_T
#undef HAVE_LIBPTHREAD #undef HAVE_LIBPTHREAD
#undef HAVE_PTHREAD_H #undef HAVE_PTHREAD_H
@ -256,7 +255,7 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* Define if compiler has function prototypes */ /* Define to 1 if the C compiler supports function prototypes. */
#undef PROTOTYPES #undef PROTOTYPES
/* Determine what socket length (socklen_t) data type is */ /* Determine what socket length (socklen_t) data type is */
@ -274,6 +273,9 @@
/* Using the Win32 Socket implementation */ /* Using the Win32 Socket implementation */
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Win32 Std C name mangling work-around */ /* Win32 Std C name mangling work-around */
#undef snprintf #undef snprintf

2
configure.in
View File

@ -217,7 +217,7 @@ AC_TRY_COMPILE2([
AC_MSG_RESULT(int *) AC_MSG_RESULT(int *)
SOCKLEN_T=int],[ SOCKLEN_T=int],[
AC_MSG_WARN(could not determine) 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]) AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
dnl ***********************Checking for availability of IPv6******************* dnl ***********************Checking for availability of IPv6*******************

4
xmlIO.c
View File

@ -2217,7 +2217,9 @@ __xmlOutputBufferCreateFilename(const char *URI,
int i = 0; int i = 0;
void *context = NULL; void *context = NULL;
char *unescaped = NULL; char *unescaped = NULL;
#ifdef HAVE_ZLIB_H
int is_file_uri = 1; int is_file_uri = 1;
#endif
if (xmlOutputCallbackInitialized == 0) if (xmlOutputCallbackInitialized == 0)
xmlRegisterDefaultOutputCallbacks(); xmlRegisterDefaultOutputCallbacks();
@ -2228,7 +2230,9 @@ __xmlOutputBufferCreateFilename(const char *URI,
if (puri != NULL) { if (puri != NULL) {
if ((puri->scheme != NULL) && if ((puri->scheme != NULL) &&
(!xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file"))) (!xmlStrEqual(BAD_CAST puri->scheme, BAD_CAST "file")))
#ifdef HAVE_ZLIB_H
is_file_uri = 0; is_file_uri = 0;
#endif
/* /*
* try to limit the damages of the URI unescaping code. * try to limit the damages of the URI unescaping code.
*/ */

5
xmlregexp.c
View File

@ -4008,11 +4008,8 @@ xmlFAParseBranch(xmlRegParserCtxtPtr ctxt) {
*/ */
static void static void
xmlFAParseRegExp(xmlRegParserCtxtPtr ctxt, int top) { 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 */ /* if not top start should have been generated by an epsilon trans */
start = ctxt->state; start = ctxt->state;
ctxt->end = NULL; ctxt->end = NULL;

5
xmlschemas.c
View File

@ -12534,7 +12534,6 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt)
xmlSchemaPtr ret = NULL; xmlSchemaPtr ret = NULL;
xmlDocPtr doc; xmlDocPtr doc;
xmlNodePtr root; xmlNodePtr root;
int nberrors;
int preserve = 0; int preserve = 0;
/* /*
@ -12547,7 +12546,6 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt)
if (ctxt == NULL) if (ctxt == NULL)
return (NULL); return (NULL);
nberrors = ctxt->nberrors;
ctxt->nberrors = 0; ctxt->nberrors = 0;
ctxt->counter = 0; ctxt->counter = 0;
ctxt->container = NULL; ctxt->container = NULL;
@ -12895,7 +12893,7 @@ xmlSchemaValidateFacetsInternal(xmlSchemaValidCtxtPtr ctxt,
xmlSchemaTypePtr biType; /* The build-in type. */ xmlSchemaTypePtr biType; /* The build-in type. */
xmlSchemaTypePtr tmpType; xmlSchemaTypePtr tmpType;
xmlSchemaFacetLinkPtr facetLink; xmlSchemaFacetLinkPtr facetLink;
int retFacet, hasFacet; int retFacet;
xmlSchemaFacetPtr facet; xmlSchemaFacetPtr facet;
unsigned long len = 0; unsigned long len = 0;
@ -12997,7 +12995,6 @@ xmlSchemaValidateFacetsInternal(xmlSchemaValidCtxtPtr ctxt,
* Process patters. Pattern facets are ORed at type level * Process patters. Pattern facets are ORed at type level
* and ANDed if derived. Walk the base type axis. * and ANDed if derived. Walk the base type axis.
*/ */
hasFacet = 0;
tmpType = type; tmpType = type;
facet = NULL; facet = NULL;
do { do {

2
xmlschemastypes.c
View File

@ -529,7 +529,7 @@ xmlSchemaIsBuiltInTypeFacet(xmlSchemaTypePtr type, int facetType)
else else
return (0); return (0);
default: default:
return (0); break;
} }
return (0); return (0);
} }