From 7042e17490515a990a45aa7237d11bc49ab0eaf0 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 9 Jul 2014 04:01:07 +0800 Subject: Imported Upstream version 2.8.0+dfsg1 --- doc/devhelp/Makefile.am | 32 +++--- doc/devhelp/Makefile.in | 171 ++++++++----------------------- doc/devhelp/general.html | 2 +- doc/devhelp/libxml2-dict.html | 12 +-- doc/devhelp/libxml2-parser.html | 9 +- doc/devhelp/libxml2-parserInternals.html | 21 +--- doc/devhelp/libxml2-relaxng.html | 2 +- doc/devhelp/libxml2-tree.html | 80 +++------------ doc/devhelp/libxml2-valid.html | 2 +- doc/devhelp/libxml2-xmlIO.html | 10 -- doc/devhelp/libxml2-xmlerror.html | 9 +- doc/devhelp/libxml2-xmlmodule.html | 4 +- doc/devhelp/libxml2-xmlregexp.html | 6 +- doc/devhelp/libxml2-xmlschemas.html | 15 --- doc/devhelp/libxml2-xmlversion.html | 5 - doc/devhelp/libxml2-xmlwriter.html | 11 +- doc/devhelp/libxml2-xpath.html | 11 -- doc/devhelp/libxml2-xpathInternals.html | 18 ++-- doc/devhelp/libxml2.devhelp | 32 +----- 19 files changed, 105 insertions(+), 347 deletions(-) (limited to 'doc/devhelp') diff --git a/doc/devhelp/Makefile.am b/doc/devhelp/Makefile.am index dad7975..36852f9 100644 --- a/doc/devhelp/Makefile.am +++ b/doc/devhelp/Makefile.am @@ -1,15 +1,5 @@ -devhelpdir = $(datadir)/gtk-doc/html/libxml2 - -dist_devhelp_DATA = \ - libxml2.devhelp \ - $(HTML_FILES) \ - $(EXTRA_FORMAT) - -HTML_FILES = \ - general.html \ - index.html \ - $(HTML_MODULES) - +DEVHELP_DIR=$(datadir)/gtk-doc/html/libxml2 +HTML_FILES=index.html general.html $(HTML_MODULES) HTML_MODULES= \ libxml2-c14n.html \ libxml2-catalog.html \ @@ -66,14 +56,18 @@ EXTRA_FORMAT= \ up.png \ style.css -EXTRA_DIST = devhelp.xsl html.xsl +EXTRA_DIST=devhelp.xsl html.xsl libxml2.devhelp $(HTML_FILES) $(EXTRA_FORMAT) -if REBUILD_DOCS -rebuild: libxml2.devhelp $(HTML_FILES) -.PHONY: rebuild +all: libxml2.devhelp $(HTML_FILES) libxml2.devhelp $(HTML_FILES): devhelp.xsl html.xsl $(top_srcdir)/doc/libxml2-api.xml + -@(echo Rebuilding devhelp files) -@(if [ -x $(XSLTPROC) ] ; then \ - echo Rebuilding devhelp files ; \ - $(XSLTPROC) --nonet -o $(srcdir)/libxml2.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/doc/libxml2-api.xml ; fi ); -endif + $(XSLTPROC) --nonet -o $(srcdir)/libxml2.devhelp devhelp.xsl $(top_srcdir)/doc/libxml2-api.xml ; fi ); + +install-data-local: + -@MKDIR_P@ $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(srcdir)/libxml2.devhelp $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(EXTRA_FORMAT:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(HTML_FILES:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR) + diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in index 5d09d76..2c87ff3 100644 --- a/doc/devhelp/Makefile.in +++ b/doc/devhelp/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,25 +14,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc/devhelp -DIST_COMMON = $(dist_devhelp_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -65,53 +46,20 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(devhelpdir)" -DATA = $(dist_devhelp_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ +AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -148,7 +96,6 @@ HTML_DIR = @HTML_DIR@ HTML_OBJ = @HTML_OBJ@ HTTP_OBJ = @HTTP_OBJ@ ICONV_LIBS = @ICONV_LIBS@ -ICU_LIBS = @ICU_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -204,6 +151,7 @@ RANLIB = @RANLIB@ RDL_LIBS = @RDL_LIBS@ READER_TEST = @READER_TEST@ RELDATE = @RELDATE@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -228,6 +176,7 @@ TEST_VTIME = @TEST_VTIME@ TEST_XINCLUDE = @TEST_XINCLUDE@ TEST_XPATH = @TEST_XPATH@ TEST_XPTR = @TEST_XPTR@ +THREADS_W32 = @THREADS_W32@ THREAD_CFLAGS = @THREAD_CFLAGS@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ @@ -260,7 +209,6 @@ WITH_SAX1 = @WITH_SAX1@ WITH_SCHEMAS = @WITH_SCHEMAS@ WITH_SCHEMATRON = @WITH_SCHEMATRON@ WITH_THREADS = @WITH_THREADS@ -WITH_THREAD_ALLOC = @WITH_THREAD_ALLOC@ WITH_TREE = @WITH_TREE@ WITH_TRIO = @WITH_TRIO@ WITH_VALID = @WITH_VALID@ @@ -334,17 +282,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -devhelpdir = $(datadir)/gtk-doc/html/libxml2 -dist_devhelp_DATA = \ - libxml2.devhelp \ - $(HTML_FILES) \ - $(EXTRA_FORMAT) - -HTML_FILES = \ - general.html \ - index.html \ - $(HTML_MODULES) - +DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2 +HTML_FILES = index.html general.html $(HTML_MODULES) HTML_MODULES = \ libxml2-c14n.html \ libxml2-catalog.html \ @@ -401,7 +340,7 @@ EXTRA_FORMAT = \ up.png \ style.css -EXTRA_DIST = devhelp.xsl html.xsl +EXTRA_DIST = devhelp.xsl html.xsl libxml2.devhelp $(HTML_FILES) $(EXTRA_FORMAT) all: all-am .SUFFIXES: @@ -441,27 +380,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-dist_devhelpDATA: $(dist_devhelp_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_devhelp_DATA)'; test -n "$(devhelpdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(devhelpdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(devhelpdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(devhelpdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(devhelpdir)" || exit $$?; \ - done - -uninstall-dist_devhelpDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_devhelp_DATA)'; test -n "$(devhelpdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(devhelpdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -501,11 +419,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(DATA) +all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(devhelpdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -516,15 +431,10 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -556,7 +466,7 @@ info: info-am info-am: -install-data-am: install-dist_devhelpDATA +install-data-am: install-data-local install-dvi: install-dvi-am @@ -600,30 +510,35 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_devhelpDATA +uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_devhelpDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_devhelpDATA - - -@REBUILD_DOCS_TRUE@rebuild: libxml2.devhelp $(HTML_FILES) -@REBUILD_DOCS_TRUE@.PHONY: rebuild - -@REBUILD_DOCS_TRUE@libxml2.devhelp $(HTML_FILES): devhelp.xsl html.xsl $(top_srcdir)/doc/libxml2-api.xml -@REBUILD_DOCS_TRUE@ -@(if [ -x $(XSLTPROC) ] ; then \ -@REBUILD_DOCS_TRUE@ echo Rebuilding devhelp files ; \ -@REBUILD_DOCS_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/libxml2.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/doc/libxml2-api.xml ; fi ); + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am + + +all: libxml2.devhelp $(HTML_FILES) + +libxml2.devhelp $(HTML_FILES): devhelp.xsl html.xsl $(top_srcdir)/doc/libxml2-api.xml + -@(echo Rebuilding devhelp files) + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) --nonet -o $(srcdir)/libxml2.devhelp devhelp.xsl $(top_srcdir)/doc/libxml2-api.xml ; fi ); + +install-data-local: + -@MKDIR_P@ $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(srcdir)/libxml2.devhelp $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(EXTRA_FORMAT:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR) + -@INSTALL@ -m 0644 $(HTML_FILES:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/devhelp/general.html b/doc/devhelp/general.html index 68f9380..6122ffe 100644 --- a/doc/devhelp/general.html +++ b/doc/devhelp/general.html @@ -33,6 +33,6 @@

libxml2 API Modules

-

DOCBparser - old DocBook SGML parser
HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX - Old SAX version 1 handler, deprecated
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionnary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanoftp - minimal FTP implementation
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines and limits exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schemastron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlunicode - Unicode character APIs
xmlversion - compile-time version informations
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

+

DOCBparser - old DocBook SGML parser
HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX - Old SAX version 1 handler, deprecated
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionnary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanoftp - minimal FTP implementation
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schemastron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlunicode - Unicode character APIs
xmlversion - compile-time version informations
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html index fd5f6b9..818121d 100644 --- a/doc/devhelp/libxml2-dict.html +++ b/doc/devhelp/libxml2-dict.html @@ -45,12 +45,10 @@

Synopsis

typedef struct _xmlDict xmlDict;
 typedef xmlDict * xmlDictPtr;
-size_t	xmlDictGetUsage			(xmlDictPtr dict);
 int	xmlDictReference		(xmlDictPtr dict);
 void	xmlDictCleanup			(void);
 int	xmlDictSize			(xmlDictPtr dict);
 const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
					 const xmlChar * name, 
					 int len);
-size_t	xmlDictSetLimit			(xmlDictPtr dict, 
					 size_t limit);
 int	xmlDictOwns			(xmlDictPtr dict, 
					 const xmlChar * str);
 const xmlChar *	xmlDictQLookup		(xmlDictPtr dict, 
					 const xmlChar * prefix, 
					 const xmlChar * name);
 int	xmlInitializeDict		(void);
@@ -95,10 +93,6 @@ The content of this structure is not made public by the API.
         
xmlDictFree ()
void	xmlDictFree			(xmlDictPtr dict)

 
Free the hash @dict and its contents. The userdata is deallocated with @f if provided.

 
dict:the dictionnary

-        

-        
xmlDictGetUsage ()
size_t	xmlDictGetUsage			(xmlDictPtr dict)

-
Get how much memory is used by a dictionary for strings Added in 2.9.0

-
dict:the dictionnary
Returns:the amount of strings allocated

         

         
xmlDictLookup ()
const xmlChar *	xmlDictLookup		(xmlDictPtr dict, 
					 const xmlChar * name, 
					 int len)

 
Add the @name to the dictionnary @dict if not present.

@@ -115,17 +109,13 @@ The content of this structure is not made public by the API.
         
xmlDictReference ()
int	xmlDictReference		(xmlDictPtr dict)

 
Increment the reference counter of a dictionary

 
dict:the dictionnary
Returns:0 in case of success and -1 in case of error

-        

-        
xmlDictSetLimit ()
size_t	xmlDictSetLimit			(xmlDictPtr dict, 
					 size_t limit)

-
Set a size limit for the dictionary Added in 2.9.0

-
dict:the dictionnary
limit:the limit in bytes
Returns:the previous limit of the dictionary or 0

         

         
xmlDictSize ()
int	xmlDictSize			(xmlDictPtr dict)

 
Query the number of elements installed in the hash @dict.

 
dict:the dictionnary
Returns:the number of elements in the dictionnary or -1 in case of error

         

         
xmlInitializeDict ()
int	xmlInitializeDict		(void)

-
Do the dictionary mutex initialization. this function is deprecated

+

Do the dictionary mutex initialization. this function is not thread safe, initialization should preferably be done once at startup

Returns:0 if initialization was already done, and 1 if that call led to the initialization
diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index 357c14a..6c66e5f 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -309,8 +309,7 @@ void xmlSetExternalEntityLoader (XML_PARSE_NOBASEFIX = 262144 /* do not fixup XINCLUDE xml:base uris */ XML_PARSE_HUGE = 524288 /* relax any hardcoded limit from the parser */ XML_PARSE_OLDSAX = 1048576 /* parse using SAX2 interface before 2.7.0 */ - XML_PARSE_IGNORE_ENC = 2097152 /* ignore internal document encoding hint */ - XML_PARSE_BIG_LINES = 4194304 /* Store big lines numbers in text PSVI field */ + XML_PARSE_IGNORE_ENC = 2097152 /* ignore internal document encoding hint */ };

@@ -662,11 +661,11 @@ void xmlSetExternalEntityLoader (

xmlParserInputGrow ()

int	xmlParserInputGrow		(xmlParserInputPtr in, 
					 int len)

This function increase the input for the parser. It tries to preserve pointers to the input buffer, and keep already read data

-
in:an XML parser input
len:an indicative size for the lookahead
Returns:the amount of char read, or -1 in case of error, 0 indicate the end of this entity
+
in:an XML parser input
len:an indicative size for the lookahead
Returns:the number of xmlChars read, or -1 in case of error, 0 indicate the end of this entity

xmlParserInputRead ()

int	xmlParserInputRead		(xmlParserInputPtr in, 
					 int len)

-

This function was internal and is deprecated.

-
in:an XML parser input
len:an indicative size for the lookahead
Returns:-1 as this is an error to use it.
+

This function refresh the input for the parser. It doesn't try to preserve pointers to the input buffer, and discard already read data

+
in:an XML parser input
len:an indicative size for the lookahead
Returns:the number of xmlChars read, or -1 in case of error, 0 indicate the end of this entity

xmlPedanticParserDefault ()

int	xmlPedanticParserDefault	(int val)

Set and return the previous value for enabling pedantic warnings.

diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html index 915ad5b..d56ab17 100644 --- a/doc/devhelp/libxml2-parserInternals.html +++ b/doc/devhelp/libxml2-parserInternals.html @@ -2,7 +2,7 @@ - parserInternals: internals routines and limits exported by the parser. + parserInternals: internals routines exported by the parser. @@ -38,7 +38,7 @@

parserInternals

-

parserInternals - internals routines and limits exported by the parser.

+

parserInternals - internals routines exported by the parser.

this module exports a number of internal parsing routines they are not really all intended for applications but can prove useful doing low level processing.

Author(s): Daniel Veillard

@@ -55,17 +55,14 @@ #define IS_LETTER(c); #define IS_IDEOGRAPHIC(c); #define MOVETO_STARTTAG(p); -#define XML_MAX_NAME_LENGTH; #define IS_ASCII_LETTER(c); #define IS_DIGIT(c); -#define XML_MAX_DICTIONARY_LIMIT; #define XML_SUBSTITUTE_PEREF; #define MOVETO_ENDTAG(p); #define SKIP_EOL(p); #define IS_EXTENDER_CH(c); #define IS_BLANK_CH(c); #define IS_LETTER_CH(c); -#define XML_MAX_LOOKUP_LIMIT; #define XML_MAX_TEXT_LENGTH; #define XML_SUBSTITUTE_NONE; #define IS_COMBINING(c); @@ -264,26 +261,14 @@ void xmlParseEntityDecl (

Macro SKIP_EOL

#define SKIP_EOL(p);

Skips the end of line chars.

p:and UTF8 string pointer
-
-
-

Macro XML_MAX_DICTIONARY_LIMIT

#define XML_MAX_DICTIONARY_LIMIT;
-

Maximum size allowed by the parser for a dictionary by default This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0

-
-
-

Macro XML_MAX_LOOKUP_LIMIT

#define XML_MAX_LOOKUP_LIMIT;
-

Maximum size allowed by the parser for ahead lookup This is an upper boundary enforced by the parser to avoid bad behaviour on "unfriendly' content Introduced in 2.9.0

Macro XML_MAX_NAMELEN

#define XML_MAX_NAMELEN;

Identifiers can be longer, but this will be more costly at runtime.

-
-
-

Macro XML_MAX_NAME_LENGTH

#define XML_MAX_NAME_LENGTH;
-

Maximum size allowed for a markup identitier This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Note that with the use of parsing dictionaries overriding the limit may result in more runtime memory usage in face of "unfriendly' content Introduced in 2.9.0

Macro XML_MAX_TEXT_LENGTH

#define XML_MAX_TEXT_LENGTH;
-

Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0

+

Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it.

Macro XML_SUBSTITUTE_BOTH

#define XML_SUBSTITUTE_BOTH;
diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html
index 23905d0..a89b58f 100644
--- a/doc/devhelp/libxml2-relaxng.html
+++ b/doc/devhelp/libxml2-relaxng.html
@@ -262,7 +262,7 @@ The content of this structure is not made public by the API.
         

         
xmlRelaxNGValidatePushCData ()
int	xmlRelaxNGValidatePushCData	(xmlRelaxNGValidCtxtPtr ctxt, 
					 const xmlChar * data, 
					 int len)

 
check the CData parsed for validation in the current stack

-
ctxt:the RelaxNG validation context
data:some character data read
len:the length of the data
Returns:1 if no validation problem was found or -1 otherwise

+
ctxt:the RelaxNG validation context
data:some character data read
len:the lenght of the data
Returns:1 if no validation problem was found or -1 otherwise

xmlRelaxNGValidatePushElement ()

int	xmlRelaxNGValidatePushElement	(xmlRelaxNGValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem)

Push a new element start on the RelaxNG validation stack.

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index 90c3903..af1f654 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -44,16 +44,15 @@

Synopsis

#define XML_LOCAL_NAMESPACE;
-#define BASE_BUFFER_SIZE;
+#define XML_XML_NAMESPACE;
 #define XML_XML_ID;
 #define xmlRootNode;
 #define XML_GET_LINE;
 #define XML_GET_CONTENT;
 #define xmlChildrenNode;
-#define XML_XML_NAMESPACE;
-#define LIBXML2_NEW_BUFFER;
+#define BASE_BUFFER_SIZE;
 typedef struct _xmlNs xmlNs;
-typedef struct _xmlElementContent xmlElementContent;
+typedef xmlBuffer * xmlBufferPtr;
 typedef xmlEnumeration * xmlEnumerationPtr;
 typedef struct _xmlBuffer xmlBuffer;
 typedef xmlParserInput * xmlParserInputPtr;
@@ -64,7 +63,7 @@ typedef xmlElementType xmlBufferAllocationScheme;
 typedef struct _xmlNode xmlNode;
 typedef xmlDoc * xmlDocPtr;
-typedef xmlBuffer * xmlBufferPtr;
+typedef struct _xmlElementContent xmlElementContent;
 typedef xmlDOMWrapCtxt * xmlDOMWrapCtxtPtr;
 typedef xmlRef * xmlRefPtr;
 typedef struct _xmlParserInputBuffer xmlParserInputBuffer;
@@ -74,7 +73,6 @@ typedef xmlNode * 
 typedef struct _xmlParserCtxt xmlParserCtxt;
 typedef xmlDtd * xmlDtdPtr;
 typedef enum xmlAttributeDefault;
-typedef struct _xmlBuf xmlBuf;
 typedef struct _xmlNotation xmlNotation;
 typedef enum xmlElementType;
 typedef struct _xmlEntity xmlEntity;
@@ -83,7 +81,6 @@ typedef xmlAttribute * xmlElementTypeVal;
 typedef xmlNotation * xmlNotationPtr;
 typedef xmlElement * xmlElementPtr;
-typedef xmlBuf * xmlBufPtr;
 typedef enum xmlElementContentOccur;
 typedef xmlAttr * xmlAttrPtr;
 typedef struct _xmlDoc xmlDoc;
@@ -107,9 +104,8 @@ typedef xmlOutputBuffer * xmlSAXHandler * xmlSAXHandlerPtr;
 xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended);
 xmlNodePtr	xmlNewDocRawNode	(xmlDocPtr doc, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * content);
-xmlChar *	xmlBufContent		(const xmlBufPtr buf);
+xmlChar *	xmlGetProp		(xmlNodePtr node, 
					 const xmlChar * name);
 xmlAttrPtr	xmlNewNsPropEatName	(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 xmlChar * name, 
					 const xmlChar * value);
-xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
					 const xmlChar * value);
 xmlNodePtr	xmlNewCDataBlock	(xmlDocPtr doc, 
					 const xmlChar * content, 
					 int len);
 void	xmlBufferWriteCHAR		(xmlBufferPtr buf, 
					 const xmlChar * string);
 xmlChar *	xmlNodeGetBase		(xmlDocPtr doc, 
					 xmlNodePtr cur);
@@ -121,16 +117,15 @@ int	xmlSaveFormatFileEnc		(const char * file
 xmlBufferPtr	xmlBufferCreate		(void);
 xmlNodePtr	xmlNewDocFragment	(xmlDocPtr doc);
 xmlNodePtr	xmlDocGetRootElement	(xmlDocPtr doc);
-xmlChar *	xmlGetProp		(xmlNodePtr node, 
					 const xmlChar * name);
+xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
					 const xmlChar * value);
 int	xmlValidateName			(const xmlChar * value, 
					 int space);
-xmlChar *	xmlBufEnd		(const xmlBufPtr buf);
+void	xmlSetBufferAllocationScheme	(xmlBufferAllocationScheme scheme);
 int	xmlValidateQName		(const xmlChar * value, 
					 int space);
 xmlAttrPtr	xmlHasNsProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace);
 xmlNodePtr	xmlAddPrevSibling	(xmlNodePtr cur, 
					 xmlNodePtr elem);
 int	xmlBufferAddHead		(xmlBufferPtr buf, 
					 const xmlChar * str, 
					 int len);
 xmlNodePtr	xmlNewPI		(const xmlChar * name, 
					 const xmlChar * content);
 void	xmlDocDumpFormatMemoryEnc	(xmlDocPtr out_doc, 
					 xmlChar ** doc_txt_ptr, 
					 int * doc_txt_len, 
					 const char * txt_encoding, 
					 int format);
-xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value);
 unsigned long	xmlChildElementCount	(xmlNodePtr parent);
 void	xmlElemDump			(FILE * f, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur);
 int	xmlSaveFormatFileTo		(xmlOutputBufferPtr buf, 
					 xmlDocPtr cur, 
					 const char * encoding, 
					 int format);
@@ -176,7 +171,6 @@ int	xmlBufferDump			(FILE * file, 
					 xmlDocPtr	xmlCopyDoc		(xmlDocPtr doc, 
					 int recursive);
 xmlDOMWrapCtxtPtr	xmlDOMWrapNewCtxt	(void);
 void	xmlDocDumpMemoryEnc		(xmlDocPtr out_doc, 
					 xmlChar ** doc_txt_ptr, 
					 int * doc_txt_len, 
					 const char * txt_encoding);
-int	xmlBufGetNodeContent		(xmlBufPtr buf, 
					 xmlNodePtr cur);
 xmlNodePtr	xmlTextMerge		(xmlNodePtr first, 
					 xmlNodePtr second);
 void	xmlDocDumpMemory		(xmlDocPtr cur, 
					 xmlChar ** mem, 
					 int * size);
 xmlNodePtr	xmlNewDocPI		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * content);
@@ -200,7 +194,6 @@ void	xmlSetDocCompressMode		(xmlUnlinkNode			(xmlNodePtr cur);
 const xmlChar *	xmlSplitQName3		(const xmlChar * name, 
					 int * len);
 typedef xmlNsPtr xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix);
-size_t	xmlBufUse			(const xmlBufPtr buf);
 xmlNodePtr	xmlDocSetRootElement	(xmlDocPtr doc, 
					 xmlNodePtr root);
 long	xmlGetLineNo			(xmlNodePtr node);
 const xmlChar *	xmlBufferContent	(const xmlBufferPtr buf);
@@ -208,7 +201,6 @@ int	xmlRemoveProp			(xmlNodePtr	xmlLastElementChild	(xmlNodePtr parent);
 xmlChar *	xmlNodeGetLang		(xmlNodePtr cur);
 int	xmlGetDocCompressMode		(xmlDocPtr doc);
-size_t	xmlBufNodeDump			(xmlBufPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format);
 xmlChar *	xmlGetNsProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace);
 xmlAttrPtr	xmlNewDocProp		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * value);
 void	xmlFreeNode			(xmlNodePtr cur);
@@ -253,13 +245,12 @@ int	xmlBufferCCat			(xmlNsPtr *	xmlGetNsList		(xmlDocPtr doc, 
					 xmlNodePtr node);
 int	xmlBufferGrow			(xmlBufferPtr buf, 
					 unsigned int len);
 int	xmlNodeIsText			(xmlNodePtr node);
-void	xmlSetBufferAllocationScheme	(xmlBufferAllocationScheme scheme);
+xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value);
 int	xmlIsXHTML			(const xmlChar * systemID, 
					 const xmlChar * publicID);
 void	xmlNodeSetLang			(xmlNodePtr cur, 
					 const xmlChar * lang);
 void	xmlFreeDtd			(xmlDtdPtr cur);
 void	xmlFreeNodeList			(xmlNodePtr cur);
 void	xmlFreeDoc			(xmlDocPtr cur);
-size_t	xmlBufShrink			(xmlBufPtr buf, 
					 size_t len);
 xmlNodePtr	xmlNewDocNode		(xmlDocPtr doc, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * content);
 int	xmlSaveFileEnc			(const char * filename, 
					 xmlDocPtr cur, 
					 const char * encoding);
 xmlAttrPtr	xmlSetNsProp		(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * value);
@@ -280,10 +271,6 @@ void	xmlFreeNsList			(
         
Macro BASE_BUFFER_SIZE
#define BASE_BUFFER_SIZE;
 
default buffer size 4000.

-

-        

-        
Macro LIBXML2_NEW_BUFFER
#define LIBXML2_NEW_BUFFER;
-
Macro used to express that the API use the new buffers for xmlParserInputBuffer and xmlOutputBuffer. The change was introduced in 2.9.0.

 

         

         
Macro XML_GET_CONTENT
#define XML_GET_CONTENT;
@@ -382,16 +369,6 @@ void	xmlFreeNsList			(XML_ATTRIBUTE_NOTATION = 10
 };
 

-

-        

-        
Structure xmlBuf
struct _xmlBuf {
-The content of this structure is not made public by the API.
-} xmlBuf;
-

-

-        

-        
Typedef xmlBufPtr
xmlBuf * xmlBufPtr;
-
A pointer to a buffer structure, the actual structure internals are not public

 

         

         
Structure xmlBuffer
struct _xmlBuffer {
@@ -711,8 +688,8 @@ The content of this structure is not made public by the API.
     xmlOutputWriteCallback	writecallback
     xmlOutputCloseCallback	closecallback
     xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufPtr	buffer	: Local buffer encoded in UTF-8 or ISOLatin
-    xmlBufPtr	conv	: if encoder != NULL buffer for output
+    xmlBufferPtr	buffer	: Local buffer encoded in UTF-8 or ISOLatin
+    xmlBufferPtr	conv	: if encoder != NULL buffer for output
     int	written	: total number of byte written
     int	error
 } xmlOutputBuffer;
@@ -812,7 +789,6 @@ The content of this structure is not made public by the API.
     int	nodeInfoMax	: Max depth of the parsing stack
     xmlParserNodeInfo *	nodeInfoTab	: array of nodeInfos
     int	input_id	: we need to label inputs
-    unsigned long	sizeentcopy	: volume of entity copy
 } xmlParserCtxt;
 

 

@@ -846,8 +822,8 @@ The content of this structure is not made public by the API.
     xmlInputReadCallback	readcallback
     xmlInputCloseCallback	closecallback
     xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufPtr	buffer	: Local buffer encoded in UTF-8
-    xmlBufPtr	raw	: if encoder != NULL buffer for raw input
+    xmlBufferPtr	buffer	: Local buffer encoded in UTF-8
+    xmlBufferPtr	raw	: if encoder != NULL buffer for raw input
     int	compressed	: -1=unknown, 0=not compressed, 1=compressed
     int	error
     unsigned long	rawconsumed	: amount consumed from raw
@@ -958,30 +934,6 @@ The content of this structure is not made public by the API.
         
xmlAttrSerializeTxtContent ()
void	xmlAttrSerializeTxtContent	(xmlBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlAttrPtr attr, 
					 const xmlChar * string)

 
Serialize text attribute values to an xml simple buffer

 
buf:the XML buffer output
doc:the document
attr:the attribute node
string:the text content

-        

-        
xmlBufContent ()
xmlChar *	xmlBufContent		(const xmlBufPtr buf)

-
Function to extract the content of a buffer

-
buf:the buffer
Returns:the internal content

-        

-        
xmlBufEnd ()
xmlChar *	xmlBufEnd		(const xmlBufPtr buf)

-
Function to extract the end of the content of a buffer

-
buf:the buffer
Returns:the end of the internal content or NULL in case of error

-        

-        
xmlBufGetNodeContent ()
int	xmlBufGetNodeContent		(xmlBufPtr buf, 
					 xmlNodePtr cur)

-
Read the value of a node @cur, this can be either the text carried directly by this node if it's a TEXT node or the aggregate string of the values carried by this node child's (TEXT and ENTITY_REF). Entity references are substituted. Fills up the buffer @buffer with this value

-
buf:a buffer xmlBufPtr
cur:the node being read
Returns:0 in case of success and -1 in case of error.

-        

-        
xmlBufNodeDump ()
size_t	xmlBufNodeDump			(xmlBufPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format)

-
Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called

-
buf:the XML buffer output
doc:the document
cur:the current node
level:the imbrication level for indenting
format:is formatting allowed
Returns:the number of bytes written to the buffer, in case of error 0 is returned or @buf stores the error

-        

-        
xmlBufShrink ()
size_t	xmlBufShrink			(xmlBufPtr buf, 
					 size_t len)

-
Remove the beginning of an XML buffer. NOTE that this routine behaviour differs from xmlBufferShrink() as it will return 0 on error instead of -1 due to size_t being used as the return type.

-
buf:the buffer to dump
len:the number of xmlChar to remove
Returns:the number of byte removed or 0 in case of failure

-        

-        
xmlBufUse ()
size_t	xmlBufUse			(const xmlBufPtr buf)

-
Function to get the length of a buffer

-
buf:the buffer
Returns:the length of data in the internal content

         

         
xmlBufferAdd ()
int	xmlBufferAdd			(xmlBufferPtr buf, 
					 const xmlChar * str, 
					 int len)

 
Add a string range to an XML buffer. if len == -1, the length of str is recomputed.

@@ -1232,7 +1184,7 @@ The content of this structure is not made public by the API.
 
parent:the parent node
Returns:the last child or NULL if none.

         

         
xmlGetLineNo ()
long	xmlGetLineNo			(xmlNodePtr node)

-
Get line number of @node. Try to override the limitation of lines being store in 16 bits ints if XML_PARSE_BIG_LINES parser option was used

+

Get line number of @node. This requires activation of this option before invoking the parser by calling xmlLineNumbersDefault(1)

node:valid node
Returns:the line number if successful, -1 otherwise

xmlGetNoNsProp ()

xmlChar *	xmlGetNoNsProp		(xmlNodePtr node, 
					 const xmlChar * name)

@@ -1400,7 +1352,7 @@ The content of this structure is not made public by the API.
 
buffer:a buffer
cur:the node being read
Returns:0 in case of success and -1 in case of error.

xmlNodeDump ()

int	xmlNodeDump			(xmlBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format)

-

Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called Since this is using xmlBuffer structures it is limited to 2GB and somehow deprecated, use xmlBufNodeDump() instead.

+

Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called

buf:the XML buffer output
doc:the document
cur:the current node
level:the imbrication level for indenting
format:is formatting allowed
Returns:the number of bytes written to the buffer or -1 in case of error

xmlNodeDumpOutput ()

void	xmlNodeDumpOutput		(xmlOutputBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format, 
					 const char * encoding)

@@ -1545,7 +1497,7 @@ The content of this structure is not made public by the API.
         

         
xmlSplitQName3 ()
const xmlChar *	xmlSplitQName3		(const xmlChar * name, 
					 int * len)

 
parse an XML qualified name string,i

-
name:the full QName
len:an int *
Returns:NULL if it is not a Qualified Name, otherwise, update len with the length in byte of the prefix and return a pointer to the start of the name without the prefix

+
name:the full QName
len:an int *
Returns:NULL if it is not a Qualified Name, otherwise, update len with the lenght in byte of the prefix and return a pointer to the start of the name without the prefix

xmlStringGetNodeList ()

xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
					 const xmlChar * value)

Parse the value string and build the node list associated. Should produce a flat tree with only TEXTs and ENTITY_REFs.

@@ -1564,7 +1516,7 @@ The content of this structure is not made public by the API.
first:the first text node
second:the second text node being merged
Returns:the first text node augmented

xmlUnlinkNode ()

void	xmlUnlinkNode			(xmlNodePtr cur)

-

Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it. Note that namespace nodes can't be unlinked as they do not have pointer to their parent.

+

Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it.

cur:the node

xmlUnsetNsProp ()

int	xmlUnsetNsProp			(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name)

diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html
index fcb68e7..3480214 100644
--- a/doc/devhelp/libxml2-valid.html
+++ b/doc/devhelp/libxml2-valid.html
@@ -512,7 +512,7 @@ The content of this structure is not made public by the API.
         

         
xmlValidatePushCData ()
int	xmlValidatePushCData		(xmlValidCtxtPtr ctxt, 
					 const xmlChar * data, 
					 int len)

 
check the CData parsed for validation in the current stack

-
ctxt:the validation context
data:some character data read
len:the length of the data
Returns:1 if no validation problem was found or 0 otherwise

+
ctxt:the validation context
data:some character data read
len:the lenght of the data
Returns:1 if no validation problem was found or 0 otherwise

xmlValidatePushElement ()

int	xmlValidatePushElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 const xmlChar * qname)

Push a new element start on the validation stack.

diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html index 5bccc27..8c41d1d 100644 --- a/doc/devhelp/libxml2-xmlIO.html +++ b/doc/devhelp/libxml2-xmlIO.html @@ -82,11 +82,9 @@ void * xmlIOHTTPOpen (const char * filename); xmlChar * xmlNormalizeWindowsPath (const xmlChar * path); typedef int xmlInputReadCallback (void * context,
char * buffer,
int len); xmlParserInputBufferPtr xmlParserInputBufferCreateStatic (const char * mem,
int size,
xmlCharEncoding enc); -const xmlChar * xmlOutputBufferGetContent (xmlOutputBufferPtr out); int xmlIOHTTPClose (void * context); int xmlOutputBufferWriteEscape (xmlOutputBufferPtr out,
const xmlChar * str,
xmlCharEncodingOutputFunc escaping); xmlOutputBufferPtr xmlOutputBufferCreateFilename (const char * URI,
xmlCharEncodingHandlerPtr encoder,
int compression); -size_t xmlOutputBufferGetSize (xmlOutputBufferPtr out); void xmlCleanupOutputCallbacks (void); typedef void * xmlInputOpenCallback (char const * filename); int xmlParserInputBufferRead (xmlParserInputBufferPtr in,
int len); @@ -256,14 +254,6 @@ void * xmlIOHTTPOpenW (const char * post_uri,

xmlOutputBufferFlush ()

int	xmlOutputBufferFlush		(xmlOutputBufferPtr out)

flushes the output I/O channel

out:a buffered output
Returns:the number of byte written or -1 in case of error.
-
-

xmlOutputBufferGetContent ()

const xmlChar *	xmlOutputBufferGetContent	(xmlOutputBufferPtr out)

-

Gives a pointer to the data currently held in the output buffer

-
out:an xmlOutputBufferPtr
Returns:a pointer to the data or NULL in case of error
-
-

xmlOutputBufferGetSize ()

size_t	xmlOutputBufferGetSize		(xmlOutputBufferPtr out)

-

Gives the length of the data currently held in the output buffer

-
out:an xmlOutputBufferPtr
Returns:0 in case or error or no data is held, the size otherwise

xmlOutputBufferWrite ()

int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * buf)

Write the content of the array in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.

diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index 27f7836..cf445dd 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -120,9 +120,7 @@ void xmlResetError (XML_FROM_WRITER = 25 /* The xmlwriter module */ XML_FROM_MODULE = 26 /* The dynamically loaded module modul */ XML_FROM_I18N = 27 /* The module handling character conversion */ - XML_FROM_SCHEMATRONV = 28 /* The Schematron validator module */ - XML_FROM_BUFFER = 29 /* The buffers module */ - XML_FROM_URI = 30 /* The URI module */ + XML_FROM_SCHEMATRONV = 28 /* The Schematron validator module */ };

@@ -251,8 +249,6 @@ void xmlResetError (XML_WAR_ENTITY_REDEFINED = 107 /* 107 */ XML_ERR_UNKNOWN_VERSION = 108 /* 108 */ XML_ERR_VERSION_MISMATCH = 109 /* 109 */ - XML_ERR_NAME_TOO_LONG = 110 /* 110 */ - XML_ERR_USER_STOP = 111 /* 111 */ XML_NS_ERR_XML_NAMESPACE = 200 XML_NS_ERR_UNDEFINED_NAMESPACE = 201 /* 201 */ XML_NS_ERR_QNAME = 202 /* 202 */ @@ -874,7 +870,8 @@ void xmlResetError (XML_I18N_EXCESS_HANDLER = 6002 /* 6002 */ XML_I18N_CONV_FAILED = 6003 /* 6003 */ XML_I18N_NO_OUTPUT = 6004 /* 6004 */ - XML_BUF_OVERFLOW = 7000 + XML_CHECK_ = 6005 /* 5033 */ + XML_CHECK_X = 6006 /* 503 */ };

diff --git a/doc/devhelp/libxml2-xmlmodule.html b/doc/devhelp/libxml2-xmlmodule.html index 08bb4ef..554cd91 100644 --- a/doc/devhelp/libxml2-xmlmodule.html +++ b/doc/devhelp/libxml2-xmlmodule.html @@ -84,11 +84,11 @@ The content of this structure is not made public by the API.
module:the module handle
Returns:0 in case of success, -1 in case of argument error

xmlModuleOpen ()

xmlModulePtr	xmlModuleOpen		(const char * name, 
					 int options)

-

Opens a module/shared library given its name or path NOTE: that due to portability issues, behaviour can only be guaranteed with @name using ASCII. We canot guarantee that an UTF-8 string would work, which is why name is a const char * and not a const xmlChar * . TODO: options are not yet implemented.

+

Opens a module/shared library given its name or path TODO: options are not yet implemented.

name:the module name
options:a set of xmlModuleOption
Returns:a handle for the module or NULL in case of error

xmlModuleSymbol ()

int	xmlModuleSymbol			(xmlModulePtr module, 
					 const char * name, 
					 void ** symbol)

-

Lookup for a symbol address in the given module NOTE: that due to portability issues, behaviour can only be guaranteed with @name using ASCII. We canot guarantee that an UTF-8 string would work, which is why name is a const char * and not a const xmlChar * .

+

Lookup for a symbol address in the given module

module:the module
name:the name of the symbol
symbol:the resulting symbol address
Returns:0 if the symbol was found, or -1 in case of error
diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html index 9427a34..4d11966 100644 --- a/doc/devhelp/libxml2-xmlregexp.html +++ b/doc/devhelp/libxml2-xmlregexp.html @@ -180,11 +180,11 @@ The content of this structure is not made public by the API.

xmlExpGetLanguage ()

int	xmlExpGetLanguage		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** langList, 
					 int len)

Find all the strings used in @exp and store them in @list

-
ctxt:the expression context
exp:the expression
langList:where to store the tokens
len:the allocated length of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings
+
ctxt:the expression context
exp:the expression
langList:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

xmlExpGetStart ()

int	xmlExpGetStart			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** tokList, 
					 int len)

Find all the strings that appears at the start of the languages accepted by @exp and store them in @list. E.g. for (a, b) | c it will return the list [a, c]

-
ctxt:the expression context
exp:the expression
tokList:where to store the tokens
len:the allocated length of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings
+
ctxt:the expression context
exp:the expression
tokList:where to store the tokens
len:the allocated lenght of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

xmlExpIsNillable ()

int	xmlExpIsNillable		(xmlExpNodePtr exp)

Finds if the expression is nillable, i.e. if it accepts the empty sequqnce

@@ -196,7 +196,7 @@ The content of this structure is not made public by the API.

xmlExpNewAtom ()

xmlExpNodePtr	xmlExpNewAtom		(xmlExpCtxtPtr ctxt, 
					 const xmlChar * name, 
					 int len)

Get the atom associated to this name from that context

-
ctxt:the expression context
name:the atom name
len:the atom name length in byte (or -1);
Returns:the node or NULL in case of error
+
ctxt:the expression context
name:the atom name
len:the atom name lenght in byte (or -1);
Returns:the node or NULL in case of error

xmlExpNewCtxt ()

xmlExpCtxtPtr	xmlExpNewCtxt		(int maxNodes, 
					 xmlDictPtr dict)

Creates a new context for manipulating expressions

diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html index 533c114..cc49dfa 100644 --- a/doc/devhelp/libxml2-xmlschemas.html +++ b/doc/devhelp/libxml2-xmlschemas.html @@ -57,14 +57,12 @@ typedef struct _xmlSchemaValidCtxt xmlSchemaValidC int xmlSchemaSAXUnplug (xmlSchemaSAXPlugPtr plug); xmlSchemaPtr xmlSchemaParse (xmlSchemaParserCtxtPtr ctxt); void xmlSchemaFreeParserCtxt (xmlSchemaParserCtxtPtr ctxt); -void xmlSchemaValidateSetFilename (xmlSchemaValidCtxtPtr vctxt,
const char * filename); xmlSchemaParserCtxtPtr xmlSchemaNewParserCtxt (const char * URL); int xmlSchemaIsValid (xmlSchemaValidCtxtPtr ctxt); typedef void xmlSchemaValidityErrorFunc (void * ctx,
const char * msg,
... ...); xmlSchemaSAXPlugPtr xmlSchemaSAXPlug (xmlSchemaValidCtxtPtr ctxt,
xmlSAXHandlerPtr * sax,
void ** user_data); int xmlSchemaValidateStream (xmlSchemaValidCtxtPtr ctxt,
xmlParserInputBufferPtr input,
xmlCharEncoding enc,
xmlSAXHandlerPtr sax,
void * user_data); int xmlSchemaGetParserErrors (xmlSchemaParserCtxtPtr ctxt,
xmlSchemaValidityErrorFunc * err,
xmlSchemaValidityWarningFunc * warn,
void ** ctx); -void xmlSchemaValidateSetLocator (xmlSchemaValidCtxtPtr vctxt,
xmlSchemaValidityLocatorFunc f,
void * ctxt); int xmlSchemaValidateOneElement (xmlSchemaValidCtxtPtr ctxt,
xmlNodePtr elem); void xmlSchemaSetValidStructuredErrors (xmlSchemaValidCtxtPtr ctxt,
xmlStructuredErrorFunc serror,
void * ctx); void xmlSchemaSetValidErrors (xmlSchemaValidCtxtPtr ctxt,
xmlSchemaValidityErrorFunc err,
xmlSchemaValidityWarningFunc warn,
void * ctx); @@ -73,7 +71,6 @@ int xmlSchemaValidateFile (xmlSchemaValidateDoc (xmlSchemaValidCtxtPtr ctxt,
xmlDocPtr doc); void xmlSchemaFree (xmlSchemaPtr schema); xmlSchemaParserCtxtPtr xmlSchemaNewMemParserCtxt (const char * buffer,
int size); -typedef int xmlSchemaValidityLocatorFunc (void * ctx,
const char ** file,
unsigned long * line); int xmlSchemaGetValidErrors (xmlSchemaValidCtxtPtr ctxt,
xmlSchemaValidityErrorFunc * err,
xmlSchemaValidityWarningFunc * warn,
void ** ctx); int xmlSchemaSetValidOptions (xmlSchemaValidCtxtPtr ctxt,
int options); void xmlSchemaSetParserErrors (xmlSchemaParserCtxtPtr ctxt,
xmlSchemaValidityErrorFunc err,
xmlSchemaValidityWarningFunc warn,
void * ctx); @@ -191,10 +188,6 @@ The content of this structure is not made public by the API.

Function type xmlSchemaValidityErrorFunc

void	xmlSchemaValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

Signature of an error callback from an XSD validation

ctx:the validation context
msg:the message
...:extra arguments
-
-

Function type xmlSchemaValidityLocatorFunc

int	xmlSchemaValidityLocatorFunc	(void * ctx, 
					 const char ** file, 
					 unsigned long * line)

-

A schemas validation locator, a callback called by the validator. This is used when file or node informations are not available to find out what file and line number are affected

-
ctx:user provided context
file:returned file information
line:returned line information
Returns:0 in case of success and -1 in case of error

Function type xmlSchemaValidityWarningFunc

void	xmlSchemaValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)

Signature of a warning callback from an XSD validation

@@ -295,14 +288,6 @@ The content of this structure is not made public by the API.

xmlSchemaValidateOneElement ()

int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

Validate a branch of a tree, starting with the given @elem.

ctxt:a schema validation context
elem:an element node
Returns:0 if the element and its subtree is valid, a positive error code number otherwise and -1 in case of an internal or API error.
-
-

xmlSchemaValidateSetFilename ()

void	xmlSchemaValidateSetFilename	(xmlSchemaValidCtxtPtr vctxt, 
					 const char * filename)

-

Workaround to provide file error reporting information when this is not provided by current APIs

-
vctxt:the schema validation context
filename:the file name
-
-

xmlSchemaValidateSetLocator ()

void	xmlSchemaValidateSetLocator	(xmlSchemaValidCtxtPtr vctxt, 
					 xmlSchemaValidityLocatorFunc f, 
					 void * ctxt)

-

Allows to set a locator function to the validation context, which will be used to provide file and line information since those are not provided as part of the SAX validation flow Setting @f to NULL disable the locator.

-
vctxt:a schema validation context
f:the locator function pointer
ctxt:the locator context

xmlSchemaValidateStream ()

int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one.

diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html index 8178614..69a04e2 100644 --- a/doc/devhelp/libxml2-xmlversion.html +++ b/doc/devhelp/libxml2-xmlversion.html @@ -83,7 +83,6 @@ #define DEBUG_MEMORY_LOCATION; #define LIBXML_ATTR_FORMAT; #define LIBXML_TEST_VERSION; -#define LIBXML_THREAD_ALLOC_ENABLED; #define LIBXML_XPATH_ENABLED; #define LIBXML_PATTERN_ENABLED; #define LIBXML_VALID_ENABLED; @@ -220,10 +219,6 @@ void xmlCheckVersion (int version);

Macro LIBXML_TEST_VERSION

#define LIBXML_TEST_VERSION;

Macro to check that the libxml version in use is compatible with the version the software has been compiled against

-
-
-

Macro LIBXML_THREAD_ALLOC_ENABLED

#define LIBXML_THREAD_ALLOC_ENABLED;
-

Whether the allocation hooks are per-thread

Macro LIBXML_THREAD_ENABLED

#define LIBXML_THREAD_ENABLED;
diff --git a/doc/devhelp/libxml2-xmlwriter.html b/doc/devhelp/libxml2-xmlwriter.html
index 7c2be92..358c9e6 100644
--- a/doc/devhelp/libxml2-xmlwriter.html
+++ b/doc/devhelp/libxml2-xmlwriter.html
@@ -51,7 +51,7 @@ int	xmlTextWriterStartDocument	(xmlTextWriterEndPI		(xmlTextWriterPtr writer);
 int	xmlTextWriterWriteBase64	(xmlTextWriterPtr writer, 
					 const char * data, 
					 int start, 
					 int len);
 int	xmlTextWriterSetIndentString	(xmlTextWriterPtr writer, 
					 const xmlChar * str);
-int	xmlTextWriterStartAttribute	(xmlTextWriterPtr writer, 
					 const xmlChar * name);
+void	xmlFreeTextWriter		(xmlTextWriterPtr writer);
 int	xmlTextWriterEndComment		(xmlTextWriterPtr writer);
 int	xmlTextWriterWriteRawLen	(xmlTextWriterPtr writer, 
					 const xmlChar * content, 
					 int len);
 int	xmlTextWriterWriteDTDExternalEntityContents	(xmlTextWriterPtr writer, 
							 const xmlChar * pubid, 
							 const xmlChar * sysid, 
							 const xmlChar * ndataid);
@@ -73,7 +73,7 @@ int	xmlTextWriterEndCDATA		(xmlTextWriterStartElementNS	(xmlTextWriterPtr writer, 
					 const xmlChar * prefix, 
					 const xmlChar * name, 
					 const xmlChar * namespaceURI);
 int	xmlTextWriterEndDTDEntity	(xmlTextWriterPtr writer);
 xmlTextWriterPtr	xmlNewTextWriter	(xmlOutputBufferPtr out);
-void	xmlFreeTextWriter		(xmlTextWriterPtr writer);
+int	xmlTextWriterStartAttribute	(xmlTextWriterPtr writer, 
					 const xmlChar * name);
 int	xmlTextWriterWriteVFormatDTDAttlist	(xmlTextWriterPtr writer, 
						 const xmlChar * name, 
						 const char * format, 
						 va_list argptr);
 int	xmlTextWriterStartPI		(xmlTextWriterPtr writer, 
					 const xmlChar * target);
 int	xmlTextWriterStartElement	(xmlTextWriterPtr writer, 
					 const xmlChar * name);
@@ -99,9 +99,8 @@ int	xmlTextWriterWriteDTDInternal
 int	xmlTextWriterWriteVFormatElementNS	(xmlTextWriterPtr writer, 
						 const xmlChar * prefix, 
						 const xmlChar * name, 
						 const xmlChar * namespaceURI, 
						 const char * format, 
						 va_list argptr);
 int	xmlTextWriterWriteDTDNotation	(xmlTextWriterPtr writer, 
					 const xmlChar * name, 
					 const xmlChar * pubid, 
					 const xmlChar * sysid);
 int	xmlTextWriterWriteFormatElement	(xmlTextWriterPtr writer, 
					 const xmlChar * name, 
					 const char * format, 
					 ... ...);
-int	xmlTextWriterSetQuoteChar	(xmlTextWriterPtr writer, 
					 xmlChar quotechar);
-int	xmlTextWriterWriteString	(xmlTextWriterPtr writer, 
					 const xmlChar * content);
 int	xmlTextWriterWriteElementNS	(xmlTextWriterPtr writer, 
					 const xmlChar * prefix, 
					 const xmlChar * name, 
					 const xmlChar * namespaceURI, 
					 const xmlChar * content);
+int	xmlTextWriterWriteString	(xmlTextWriterPtr writer, 
					 const xmlChar * content);
 int	xmlTextWriterFullEndElement	(xmlTextWriterPtr writer);
 int	xmlTextWriterWriteVFormatAttributeNS	(xmlTextWriterPtr writer, 
						 const xmlChar * prefix, 
						 const xmlChar * name, 
						 const xmlChar * namespaceURI, 
						 const char * format, 
						 va_list argptr);
 int	xmlTextWriterFlush		(xmlTextWriterPtr writer);
@@ -236,10 +235,6 @@ The content of this structure is not made public by the API.
         
xmlTextWriterSetIndentString ()
int	xmlTextWriterSetIndentString	(xmlTextWriterPtr writer, 
					 const xmlChar * str)

 
Set string indentation.

 
writer:the xmlTextWriterPtr
str:the xmlChar string
Returns:-1 on error or 0 otherwise.

-        

-        
xmlTextWriterSetQuoteChar ()
int	xmlTextWriterSetQuoteChar	(xmlTextWriterPtr writer, 
					 xmlChar quotechar)

-
Set the character used for quoting attributes.

-
writer:the xmlTextWriterPtr
quotechar:the quote character
Returns:-1 on error or 0 otherwise.

         

         
xmlTextWriterStartAttribute ()
int	xmlTextWriterStartAttribute	(xmlTextWriterPtr writer, 
					 const xmlChar * name)

 
Start an xml attribute.

diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html
index 640c715..7efa7bc 100644
--- a/doc/devhelp/libxml2-xpath.html
+++ b/doc/devhelp/libxml2-xpath.html
@@ -70,7 +70,6 @@ typedef xmlXPathAxis * xmlXPathParserContext;
 int	xmlXPathCastNodeSetToBoolean	(xmlNodeSetPtr ns);
 typedef xmlXPathFunction xmlXPathFuncLookupFunc	(void * ctxt, 
						 const xmlChar * name, 
						 const xmlChar * ns_uri);
-xmlXPathObjectPtr	xmlXPathNodeEval	(xmlNodePtr node, 
						 const xmlChar * str, 
						 xmlXPathContextPtr ctx);
 xmlChar *	xmlXPathCastNodeToString	(xmlNodePtr node);
 int	xmlXPathIsNaN			(double val);
 int	xmlXPathContextSetCache		(xmlXPathContextPtr ctxt, 
					 int active, 
					 int value, 
					 int options);
@@ -105,7 +104,6 @@ int	xmlXPathCmpNodes		(xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
						 const xmlChar * str);
 typedef void xmlXPathEvalFunc		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 xmlChar *	xmlXPathCastBooleanToString	(int val);
-int	xmlXPathSetContextNode		(xmlNodePtr node, 
					 xmlXPathContextPtr ctx);
 int	xmlXPathCastNumberToBoolean	(double val);
 void	xmlXPathFreeNodeSet		(xmlNodeSetPtr obj);
 void	xmlXPathFreeCompExpr		(xmlXPathCompExprPtr comp);
@@ -248,7 +246,6 @@ The content of this structure is not made public by the API.
     XPATH_INVALID_CHAR_ERROR = 21
     XPATH_INVALID_CTXT = 22
     XPATH_STACK_ERROR = 23
-    XPATH_FORBID_VARIABLE_ERROR = 24
 };

@@ -515,10 +512,6 @@ The content of this structure is not made public by the API.

xmlXPathNewContext ()

xmlXPathContextPtr	xmlXPathNewContext	(xmlDocPtr doc)

Create a new xmlXPathContext

doc:the XML document
Returns:the xmlXPathContext just allocated. The caller will need to free it.
-
-

xmlXPathNodeEval ()

xmlXPathObjectPtr	xmlXPathNodeEval	(xmlNodePtr node, 
						 const xmlChar * str, 
						 xmlXPathContextPtr ctx)

-

Evaluate the XPath Location Path in the given context. The node 'node' is set as the context node. The context node is not restored.

-
node:the node to to use as the context node
str:the XPath expression
ctx:the XPath context
Returns:the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.

xmlXPathNodeSetCreate ()

xmlNodeSetPtr	xmlXPathNodeSetCreate	(xmlNodePtr val)

Create a new xmlNodeSetPtr of type double and of value @val

@@ -532,10 +525,6 @@ The content of this structure is not made public by the API.

Call this routine to speed up XPath computation on static documents. This stamps all the element nodes with the document order Like for line information, the order is kept in the element->content field, the value stored is actually - the node number (starting at -1) to be able to differentiate from line numbers.

doc:an input document
Returns:the number of elements found in the document or -1 in case of error.
-

xmlXPathSetContextNode ()

int	xmlXPathSetContextNode		(xmlNodePtr node, 
					 xmlXPathContextPtr ctx)

-

Sets 'node' as the context node. The node must be in the same document as that associated with the context.

-
node:the node to to use as the context node
ctx:the XPath context
Returns:-1 in case of error or 0 if successful
-
diff --git a/doc/devhelp/libxml2-xpathInternals.html b/doc/devhelp/libxml2-xpathInternals.html index 0597343..6200688 100644 --- a/doc/devhelp/libxml2-xpathInternals.html +++ b/doc/devhelp/libxml2-xpathInternals.html @@ -153,7 +153,7 @@ void xmlXPathModValues (xmlXPathObjectPtr xmlXPathWrapString (xmlChar * val); void xmlXPathLangFunction (xmlXPathParserContextPtr ctxt,
int nargs); int xmlXPathRegisterFuncNS (xmlXPathContextPtr ctxt,
const xmlChar * name,
const xmlChar * ns_uri,
xmlXPathFunction f); -int xmlXPathNodeSetAddNs (xmlNodeSetPtr cur,
xmlNodePtr node,
xmlNsPtr ns); +void xmlXPathNodeSetAddNs (xmlNodeSetPtr cur,
xmlNodePtr node,
xmlNsPtr ns); void xmlXPathLocalNameFunction (xmlXPathParserContextPtr ctxt,
int nargs); xmlNodeSetPtr xmlXPathDifference (xmlNodeSetPtr nodes1,
xmlNodeSetPtr nodes2); xmlNodeSetPtr xmlXPathLeadingSorted (xmlNodeSetPtr nodes1,
xmlNodeSetPtr nodes2); @@ -171,8 +171,8 @@ void xmlXPathSubstringAfterFunctionxmlXPathObjectPtr xmlXPathWrapCString (char * val); void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); xmlNodeSetPtr xmlXPathNodeTrailing (xmlNodeSetPtr nodes,
xmlNodePtr node); -int xmlXPathNodeSetAdd (xmlNodeSetPtr cur,
xmlNodePtr val); -int xmlXPathNodeSetAddUnique (xmlNodeSetPtr cur,
xmlNodePtr val); +void xmlXPathNodeSetAdd (xmlNodeSetPtr cur,
xmlNodePtr val); +void xmlXPathNodeSetAddUnique (xmlNodeSetPtr cur,
xmlNodePtr val); xmlXPathObjectPtr xmlXPathNewValueTree (xmlNodePtr val); xmlNodeSetPtr xmlXPathDistinct (xmlNodeSetPtr nodes); xmlXPathObjectPtr xmlXPathVariableLookup (xmlXPathContextPtr ctxt,
const xmlChar * name); @@ -549,17 +549,17 @@ void xmlXPathDebugDumpObject (FILE * out

Implements the EXSLT - Sets leading() function: node-set set:leading (node-set, node-set)

nodes:a node-set, sorted by document order
node:a node
Returns:the nodes in @nodes that precede @node in document order, @nodes if @node is NULL or an empty node-set if @nodes doesn't contain @node
-

xmlXPathNodeSetAdd ()

int	xmlXPathNodeSetAdd		(xmlNodeSetPtr cur, 
					 xmlNodePtr val)

+        
xmlXPathNodeSetAdd ()
void	xmlXPathNodeSetAdd		(xmlNodeSetPtr cur, 
					 xmlNodePtr val)

 
add a new xmlNodePtr to an existing NodeSet

-
cur:the initial node set
val:a new xmlNodePtr
Returns:0 in case of success, and -1 in case of error

+
cur:the initial node set
val:a new xmlNodePtr
-

xmlXPathNodeSetAddNs ()

int	xmlXPathNodeSetAddNs		(xmlNodeSetPtr cur, 
					 xmlNodePtr node, 
					 xmlNsPtr ns)

+        
xmlXPathNodeSetAddNs ()
void	xmlXPathNodeSetAddNs		(xmlNodeSetPtr cur, 
					 xmlNodePtr node, 
					 xmlNsPtr ns)

 
add a new namespace node to an existing NodeSet

-
cur:the initial node set
node:the hosting node
ns:a the namespace node
Returns:0 in case of success and -1 in case of error

+
cur:the initial node set
node:the hosting node
ns:a the namespace node
-

xmlXPathNodeSetAddUnique ()

int	xmlXPathNodeSetAddUnique	(xmlNodeSetPtr cur, 
					 xmlNodePtr val)

+        
xmlXPathNodeSetAddUnique ()
void	xmlXPathNodeSetAddUnique	(xmlNodeSetPtr cur, 
					 xmlNodePtr val)

 
add a new xmlNodePtr to an existing NodeSet, optimized version when we are sure the node is not already in the set.

-
cur:the initial node set
val:a new xmlNodePtr
Returns:0 in case of success and -1 in case of failure

+
cur:the initial node set
val:a new xmlNodePtr

xmlXPathNodeSetContains ()

int	xmlXPathNodeSetContains		(xmlNodeSetPtr cur, 
					 xmlNodePtr val)

checks whether @cur contains @val

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index 282546a..e564951 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -91,7 +91,6 @@ - @@ -122,7 +121,6 @@ - @@ -166,10 +164,7 @@ - - - @@ -356,7 +351,6 @@ - @@ -403,6 +397,7 @@ + @@ -441,6 +436,7 @@ + @@ -578,7 +574,6 @@ - @@ -615,7 +610,6 @@ - @@ -631,7 +625,6 @@ - @@ -655,7 +648,6 @@ - @@ -775,7 +767,6 @@ - @@ -1518,7 +1509,6 @@ - @@ -1583,7 +1573,6 @@ - @@ -1721,7 +1710,6 @@ - @@ -1880,7 +1868,6 @@ - @@ -2110,12 +2097,6 @@ - - - - - - @@ -2257,12 +2238,10 @@ - - @@ -2623,8 +2602,6 @@ - - @@ -2920,8 +2897,6 @@ - - @@ -3094,7 +3069,6 @@ - @@ -3483,7 +3457,6 @@ - @@ -3526,7 +3499,6 @@ - -- cgit v1.2.3