lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

code cleanup, especially the function comments. fixed a small bug when

Browse Source 
* DOCBparser.c HTMLparser.c c14n.c debugXML.c encoding.c hash.c
  nanoftp.c nanohttp.c parser.c parserInternals.c testC14N.c
  testDocbook.c threads.c tree.c valid.c xmlIO.c xmllint.c xmlmemory.c
  xmlreader.c xmlregexp.c xmlschemas.c xmlschemastypes.c xpath.c:
  code cleanup, especially the function comments.
* tree.c: fixed a small bug when freeing nodes which are XInclude ones.
Daniel
This commit is contained in:
Daniel Veillard
2002-12-10 15:19:08 +00:00
parent e1ca50330b
commit 01c13b5be2
24 changed files with 173 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Dec 10 16:16:34 CET 2002 Daniel Veillard <daniel@veillard.com>
* DOCBparser.c HTMLparser.c c14n.c debugXML.c encoding.c hash.c
nanoftp.c nanohttp.c parser.c parserInternals.c testC14N.c
testDocbook.c threads.c tree.c valid.c xmlIO.c xmllint.c xmlmemory.c
xmlreader.c xmlregexp.c xmlschemas.c xmlschemastypes.c xpath.c:
code cleanup, especially the function comments.
* tree.c: fixed a small bug when freeing nodes which are XInclude ones.
Mon Dec 9 15:08:17 CET 2002 Daniel Veillard <daniel@veillard.com> Mon Dec 9 15:08:17 CET 2002 Daniel Veillard <daniel@veillard.com>
* Makefile.am xmlreader.c include/libxml/Makefile.am * Makefile.am xmlreader.c include/libxml/Makefile.am

4
c14n.c
View File

@ -283,8 +283,8 @@ xmlC14NStrEqual(const xmlChar *str1, const xmlChar *str2) {
/** /**
* xmlC14NVisibleNsStackFind: * xmlC14NVisibleNsStackFind:
* @ctx the C14N context * @ctx: the C14N context
* @ns the namespace to check * @ns: the namespace to check
* *
* Checks whether the given namespace was already rendered or not * Checks whether the given namespace was already rendered or not
* *

2
debugXML.c
View File

@ -2052,7 +2052,7 @@ xmlShellPwd(xmlShellCtxtPtr ctxt ATTRIBUTE_UNUSED, char *buffer,
} }
/** /**
* xmlShell * xmlShell:
* @doc: the initial document * @doc: the initial document
* @filename: the output buffer * @filename: the output buffer
* @input: the line reading function * @input: the line reading function

2
encoding.c
View File

@ -193,7 +193,7 @@ error:
} }
/** /**
* xmlCheckUTF8: Check utf-8 string for legality. * xmlCheckUTF8:
* @utf: Pointer to putative utf-8 encoded string. * @utf: Pointer to putative utf-8 encoded string.
* *
* Checks @utf for being valid utf-8. @utf is assumed to be * Checks @utf for being valid utf-8. @utf is assumed to be

24
hash.c
View File

@ -537,14 +537,6 @@ xmlHashLookup3(xmlHashTablePtr table, const xmlChar *name,
return(NULL); return(NULL);
} }
/**
* xmlHashScan:
* @table: the hash table
* @f: the scanner function for items in the hash
* @data: extra data passed to f
*
* Scan the hash @table and applied @f to each value.
*/
typedef struct { typedef struct {
xmlHashScanner hashscanner; xmlHashScanner hashscanner;
void *data; void *data;
@ -558,6 +550,14 @@ stubHashScannerFull (void *payload, void *data, const xmlChar *name,
stubdata->hashscanner (payload, stubdata->data, (xmlChar *) name); stubdata->hashscanner (payload, stubdata->data, (xmlChar *) name);
} }
/**
* xmlHashScan:
* @table: the hash table
* @f: the scanner function for items in the hash
* @data: extra data passed to f
*
* Scan the hash @table and applied @f to each value.
*/
void void
xmlHashScan(xmlHashTablePtr table, xmlHashScanner f, void *data) { xmlHashScan(xmlHashTablePtr table, xmlHashScanner f, void *data) {
stubData stubdata; stubData stubdata;
@ -752,13 +752,14 @@ int xmlHashRemoveEntry(xmlHashTablePtr table, const xmlChar *name,
* *
* Returns 0 if the removal succeeded and -1 in case of error or not found. * Returns 0 if the removal succeeded and -1 in case of error or not found.
*/ */
int xmlHashRemoveEntry2(xmlHashTablePtr table, const xmlChar *name, int
xmlHashRemoveEntry2(xmlHashTablePtr table, const xmlChar *name,
const xmlChar *name2, xmlHashDeallocator f) { const xmlChar *name2, xmlHashDeallocator f) {
return(xmlHashRemoveEntry3(table, name, name2, NULL, f)); return(xmlHashRemoveEntry3(table, name, name2, NULL, f));
} }
/** /**
* xmlHashRemoveEntry3 * xmlHashRemoveEntry3:
* @table: the hash table * @table: the hash table
* @name: the name of the userdata * @name: the name of the userdata
* @name2: a second name of the userdata * @name2: a second name of the userdata
@ -771,7 +772,8 @@ int xmlHashRemoveEntry2(xmlHashTablePtr table, const xmlChar *name,
* *
* Returns 0 if the removal succeeded and -1 in case of error or not found. * Returns 0 if the removal succeeded and -1 in case of error or not found.
*/ */
int xmlHashRemoveEntry3(xmlHashTablePtr table, const xmlChar *name, int
xmlHashRemoveEntry3(xmlHashTablePtr table, const xmlChar *name,
const xmlChar *name2, const xmlChar *name3, xmlHashDeallocator f) { const xmlChar *name2, const xmlChar *name3, xmlHashDeallocator f) {
unsigned long key; unsigned long key;
xmlHashEntryPtr entry; xmlHashEntryPtr entry;

2
nanoftp.c
View File

@ -1853,12 +1853,14 @@ xmlNanoFTPClose(void *ctx) {
* Basic test in Standalone mode * * Basic test in Standalone mode *
* * * *
************************************************************************/ ************************************************************************/
static
void ftpList(void *userData, const char *filename, const char* attrib, void ftpList(void *userData, const char *filename, const char* attrib,
const char *owner, const char *group, unsigned long size, int links, const char *owner, const char *group, unsigned long size, int links,
int year, const char *month, int day, int hour, int minute) { int year, const char *month, int day, int hour, int minute) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%s %s %s %ld %s\n", attrib, owner, group, size, filename); "%s %s %s %ld %s\n", attrib, owner, group, size, filename);
} }
static
void ftpData(void *userData, const char *data, int len) { void ftpData(void *userData, const char *data, int len) {
if (userData == NULL) return; if (userData == NULL) return;
if (len <= 0) { if (len <= 0) {

4
nanohttp.c
View File

@ -1419,7 +1419,7 @@ xmlNanoHTTPAuthHeader(void *ctx) {
} }
/** /**
* xmlNanoHTTPContentLength * xmlNanoHTTPContentLength:
* @ctx: the HTTP context * @ctx: the HTTP context
* *
* Return the specified content length from the HTTP header. Note that * Return the specified content length from the HTTP header. Note that
@ -1434,7 +1434,7 @@ xmlNanoHTTPContentLength( void * ctx ) {
} }
/** /**
* xmlNanoHTTPFetchContent * xmlNanoHTTPFetchContent:
* @ctx: the HTTP context * @ctx: the HTTP context
* @ptr: pointer to set to the content buffer. * @ptr: pointer to set to the content buffer.
* @len: integer pointer to hold the length of the content * @len: integer pointer to hold the length of the content

20
parser.c
View File

@ -1234,7 +1234,6 @@ xmlCharStrndup(const char *cur, int len) {
/** /**
* xmlCharStrdup: * xmlCharStrdup:
* @cur: the input char * * @cur: the input char *
* @len: the len of @cur
* *
* a strdup for char's to xmlChar's * a strdup for char's to xmlChar's
* *
@ -2390,6 +2389,16 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) {
return ret; return ret;
} }
/**
* xmlParseAttValueComplex:
* @ctxt: an XML parser context
*
* parse a value for an attribute, this is the fallback function
* of xmlParseAttValue() when the attribute parsing requires handling
* of non-ASCII characters.
*
* Returns the AttValue parsed or NULL. The value has to be freed by the caller.
*/
xmlChar * xmlChar *
xmlParseAttValueComplex(xmlParserCtxtPtr ctxt) { xmlParseAttValueComplex(xmlParserCtxtPtr ctxt) {
xmlChar limit = 0; xmlChar limit = 0;
@ -2838,6 +2847,15 @@ get_more:
xmlParseCharDataComplex(ctxt, cdata); xmlParseCharDataComplex(ctxt, cdata);
} }
/**
* xmlParseCharDataComplex:
* @ctxt: an XML parser context
* @cdata: int indicating whether we are within a CDATA section
*
* parse a CharData section.this is the fallback function
* of xmlParseCharData() when the parsing requires handling
* of non-ASCII characters.
*/
void void
xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int cdata) { xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int cdata) {
xmlChar buf[XML_PARSER_BIG_BUFFER_SIZE + 5]; xmlChar buf[XML_PARSER_BIG_BUFFER_SIZE + 5];

31
parserInternals.c
View File

@ -412,20 +412,6 @@ xmlIsBlank(int c) {
return(((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) || ((c) == 0x0D)); return(((c) == 0x20) || ((c) == 0x09) || ((c) == 0xA) || ((c) == 0x0D));
} }
/**
* xmlIsBaseChar:
* @c: an unicode character (int)
*
* Check whether the character is allowed by the production
* [85] BaseChar ::= ... long list see REC ...
*
* VI is your friend !
* :1,$ s/\[#x\([0-9A-Z]*\)-#x\([0-9A-Z]*\)\]/ (((c) >= 0x\1) \&\& ((c) <= 0x\2)) ||/
* and
* :1,$ s/#x\([0-9A-Z]*\)/ ((c) == 0x\1) ||/
*
* Returns 0 if not, non-zero otherwise
*/
static int xmlBaseArray[] = { static int xmlBaseArray[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0000 - 0x000F */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0000 - 0x000F */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 - 0x001F */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 - 0x001F */
@ -445,6 +431,20 @@ static int xmlBaseArray[] = {
1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00F0 - 0x00FF */ 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00F0 - 0x00FF */
}; };
/**
* xmlIsBaseChar:
* @c: an unicode character (int)
*
* Check whether the character is allowed by the production
* [85] BaseChar ::= ... long list see REC ...
*
* VI is your friend !
* :1,$ s/\[#x\([0-9A-Z]*\)-#x\([0-9A-Z]*\)\]/ (((c) >= 0x\1) \&\& ((c) <= 0x\2)) ||/
* and
* :1,$ s/#x\([0-9A-Z]*\)/ ((c) == 0x\1) ||/
*
* Returns 0 if not, non-zero otherwise
*/
int int
xmlIsBaseChar(int c) { xmlIsBaseChar(int c) {
return( return(
@ -891,6 +891,7 @@ xmlIsPubidChar(int c) {
#ifdef DEBUG_INPUT #ifdef DEBUG_INPUT
#define CHECK_BUFFER(in) check_buffer(in) #define CHECK_BUFFER(in) check_buffer(in)
static
void check_buffer(xmlParserInputPtr in) { void check_buffer(xmlParserInputPtr in) {
if (in->base != in->buf->buffer->content) { if (in->base != in->buf->buffer->content) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
@ -2383,7 +2384,7 @@ xmlClearParserCtxt(xmlParserCtxtPtr ctxt)
/** /**
* xmlParserFindNodeInfo: * xmlParserFindNodeInfo:
* @ctxt: an XML parser context * @ctx: an XML parser context
* @node: an XML node within the tree * @node: an XML node within the tree
* *
* Find the parser node info struct for a given node * Find the parser node info struct for a given node

7
testC14N.c
View File

@ -179,7 +179,8 @@ int main(int argc, char **argv) {
} \ } \
} }
xmlChar **parse_list(xmlChar *str) { static xmlChar **
parse_list(xmlChar *str) {
xmlChar **buffer; xmlChar **buffer;
xmlChar **out = NULL; xmlChar **out = NULL;
int buffer_size = 0; int buffer_size = 0;
@ -221,7 +222,7 @@ xmlChar **parse_list(xmlChar *str) {
return buffer; return buffer;
} }
xmlXPathObjectPtr static xmlXPathObjectPtr
load_xpath_expr (xmlDocPtr parent_doc, const char* filename) { load_xpath_expr (xmlDocPtr parent_doc, const char* filename) {
xmlXPathObjectPtr xpath; xmlXPathObjectPtr xpath;
xmlDocPtr doc; xmlDocPtr doc;
@ -312,7 +313,7 @@ load_xpath_expr (xmlDocPtr parent_doc, const char* filename) {
return(xpath); return(xpath);
} }
void static void
print_xpath_nodes(xmlNodeSetPtr nodes) { print_xpath_nodes(xmlNodeSetPtr nodes) {
xmlNodePtr cur; xmlNodePtr cur;
int i; int i;

56
testDocbook.c
View File

@ -97,7 +97,7 @@ extern xmlSAXHandlerPtr debugSAXHandler;
* Returns 1 if true * Returns 1 if true
*/ */
static int static int
isStandaloneDebug(void *ctx ATTRIBUTE_UNUSED) isStandaloneDebug(void *ctxt ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.isStandalone()\n"); fprintf(stdout, "SAX.isStandalone()\n");
return(0); return(0);
@ -112,7 +112,7 @@ isStandaloneDebug(void *ctx ATTRIBUTE_UNUSED)
* Returns 1 if true * Returns 1 if true
*/ */
static int static int
hasInternalSubsetDebug(void *ctx ATTRIBUTE_UNUSED) hasInternalSubsetDebug(void *ctxt ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.hasInternalSubset()\n"); fprintf(stdout, "SAX.hasInternalSubset()\n");
return(0); return(0);
@ -127,20 +127,20 @@ hasInternalSubsetDebug(void *ctx ATTRIBUTE_UNUSED)
* Returns 1 if true * Returns 1 if true
*/ */
static int static int
hasExternalSubsetDebug(void *ctx ATTRIBUTE_UNUSED) hasExternalSubsetDebug(void *ctxt ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.hasExternalSubset()\n"); fprintf(stdout, "SAX.hasExternalSubset()\n");
return(0); return(0);
} }
/** /**
* hasInternalSubsetDebug: * internalSubsetDebug:
* @ctxt: An XML parser context * @ctxt: An XML parser context
* *
* Does this document has an internal subset * Does this document has an internal subset
*/ */
static void static void
internalSubsetDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, internalSubsetDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name,
const xmlChar *ExternalID, const xmlChar *SystemID) const xmlChar *ExternalID, const xmlChar *SystemID)
{ {
fprintf(stdout, "SAX.internalSubset(%s,", name); fprintf(stdout, "SAX.internalSubset(%s,", name);
@ -169,7 +169,7 @@ internalSubsetDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
* Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour. * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
*/ */
static xmlParserInputPtr static xmlParserInputPtr
resolveEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *publicId, const xmlChar *systemId) resolveEntityDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *publicId, const xmlChar *systemId)
{ {
/* xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; */ /* xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; */
@ -201,7 +201,7 @@ resolveEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *publicId, const xm
* Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour. * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
*/ */
static xmlEntityPtr static xmlEntityPtr
getEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name) getEntityDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name)
{ {
fprintf(stdout, "SAX.getEntity(%s)\n", name); fprintf(stdout, "SAX.getEntity(%s)\n", name);
return(NULL); return(NULL);
@ -217,7 +217,7 @@ getEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name)
* Returns the xmlParserInputPtr * Returns the xmlParserInputPtr
*/ */
static xmlEntityPtr static xmlEntityPtr
getParameterEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name) getParameterEntityDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name)
{ {
fprintf(stdout, "SAX.getParameterEntity(%s)\n", name); fprintf(stdout, "SAX.getParameterEntity(%s)\n", name);
return(NULL); return(NULL);
@ -236,7 +236,7 @@ getParameterEntityDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name)
* An entity definition has been parsed * An entity definition has been parsed
*/ */
static void static void
entityDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, int type, entityDeclDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name, int type,
const xmlChar *publicId, const xmlChar *systemId, xmlChar *content) const xmlChar *publicId, const xmlChar *systemId, xmlChar *content)
{ {
fprintf(stdout, "SAX.entityDecl(%s, %d, %s, %s, %s)\n", fprintf(stdout, "SAX.entityDecl(%s, %d, %s, %s, %s)\n",
@ -252,7 +252,7 @@ entityDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, int type,
* An attribute definition has been parsed * An attribute definition has been parsed
*/ */
static void static void
attributeDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *elem, attributeDeclDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *elem,
const xmlChar *name, int type, int def, const xmlChar *name, int type, int def,
const xmlChar *defaultValue, const xmlChar *defaultValue,
xmlEnumerationPtr tree ATTRIBUTE_UNUSED) xmlEnumerationPtr tree ATTRIBUTE_UNUSED)
@ -271,7 +271,7 @@ attributeDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *elem,
* An element definition has been parsed * An element definition has been parsed
*/ */
static void static void
elementDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, int type, elementDeclDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name, int type,
xmlElementContentPtr content ATTRIBUTE_UNUSED) xmlElementContentPtr content ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.elementDecl(%s, %d, ...)\n", fprintf(stdout, "SAX.elementDecl(%s, %d, ...)\n",
@ -288,7 +288,7 @@ elementDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, int type,
* What to do when a notation declaration has been parsed. * What to do when a notation declaration has been parsed.
*/ */
static void static void
notationDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, notationDeclDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name,
const xmlChar *publicId, const xmlChar *systemId) const xmlChar *publicId, const xmlChar *systemId)
{ {
fprintf(stdout, "SAX.notationDecl(%s, %s, %s)\n", fprintf(stdout, "SAX.notationDecl(%s, %s, %s)\n",
@ -306,7 +306,7 @@ notationDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
* What to do when an unparsed entity declaration is parsed * What to do when an unparsed entity declaration is parsed
*/ */
static void static void
unparsedEntityDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, unparsedEntityDeclDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name,
const xmlChar *publicId, const xmlChar *systemId, const xmlChar *publicId, const xmlChar *systemId,
const xmlChar *notationName) const xmlChar *notationName)
{ {
@ -324,7 +324,7 @@ unparsedEntityDeclDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
* Everything is available on the context, so this is useless in our case. * Everything is available on the context, so this is useless in our case.
*/ */
static void static void
setDocumentLocatorDebug(void *ctx ATTRIBUTE_UNUSED, setDocumentLocatorDebug(void *ctxt ATTRIBUTE_UNUSED,
xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED) xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.setDocumentLocator()\n"); fprintf(stdout, "SAX.setDocumentLocator()\n");
@ -337,7 +337,7 @@ setDocumentLocatorDebug(void *ctx ATTRIBUTE_UNUSED,
* called when the document start being processed. * called when the document start being processed.
*/ */
static void static void
startDocumentDebug(void *ctx ATTRIBUTE_UNUSED) startDocumentDebug(void *ctxt ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.startDocument()\n"); fprintf(stdout, "SAX.startDocument()\n");
} }
@ -349,7 +349,7 @@ startDocumentDebug(void *ctx ATTRIBUTE_UNUSED)
* called when the document end has been detected. * called when the document end has been detected.
*/ */
static void static void
endDocumentDebug(void *ctx ATTRIBUTE_UNUSED) endDocumentDebug(void *ctxt ATTRIBUTE_UNUSED)
{ {
fprintf(stdout, "SAX.endDocument()\n"); fprintf(stdout, "SAX.endDocument()\n");
} }
@ -362,7 +362,7 @@ endDocumentDebug(void *ctx ATTRIBUTE_UNUSED)
* called when an opening tag has been processed. * called when an opening tag has been processed.
*/ */
static void static void
startElementDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, const xmlChar **atts) startElementDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name, const xmlChar **atts)
{ {
int i; int i;
@ -396,7 +396,7 @@ startElementDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, const xmlChar
* called when the end of an element has been detected. * called when the end of an element has been detected.
*/ */
static void static void
endElementDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name) endElementDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name)
{ {
fprintf(stdout, "SAX.endElement(%s)\n", (char *) name); fprintf(stdout, "SAX.endElement(%s)\n", (char *) name);
} }
@ -411,7 +411,7 @@ endElementDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name)
* Question: how much at a time ??? * Question: how much at a time ???
*/ */
static void static void
charactersDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch, int len) charactersDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *ch, int len)
{ {
unsigned char output[40]; unsigned char output[40];
int inlen = len, outlen = 30; int inlen = len, outlen = 30;
@ -430,7 +430,7 @@ charactersDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch, int len)
* called when an entity reference is detected. * called when an entity reference is detected.
*/ */
static void static void
referenceDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name) referenceDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name)
{ {
fprintf(stdout, "SAX.reference(%s)\n", name); fprintf(stdout, "SAX.reference(%s)\n", name);
} }
@ -446,7 +446,7 @@ referenceDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name)
* Question: how much at a time ??? * Question: how much at a time ???
*/ */
static void static void
ignorableWhitespaceDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch, int len) ignorableWhitespaceDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *ch, int len)
{ {
char output[40]; char output[40];
int i; int i;
@ -468,7 +468,7 @@ ignorableWhitespaceDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch, int len)
* A processing instruction has been parsed. * A processing instruction has been parsed.
*/ */
static void static void
processingInstructionDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *target, processingInstructionDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *target,
const xmlChar *data) const xmlChar *data)
{ {
fprintf(stdout, "SAX.processingInstruction(%s, %s)\n", fprintf(stdout, "SAX.processingInstruction(%s, %s)\n",
@ -483,7 +483,7 @@ processingInstructionDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *target,
* A comment has been parsed. * A comment has been parsed.
*/ */
static void static void
commentDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value) commentDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *value)
{ {
fprintf(stdout, "SAX.comment(%s)\n", value); fprintf(stdout, "SAX.comment(%s)\n", value);
} }
@ -497,7 +497,7 @@ commentDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value)
* called when a pcdata block has been parsed * called when a pcdata block has been parsed
*/ */
static void static void
cdataBlockDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value, int len) cdataBlockDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *value, int len)
{ {
fprintf(stdout, "SAX.pcdata(%.20s, %d)\n", fprintf(stdout, "SAX.pcdata(%.20s, %d)\n",
(char *) value, len); (char *) value, len);
@ -510,7 +510,7 @@ cdataBlockDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value, int len)
* Does this document has an external subset * Does this document has an external subset
*/ */
static void static void
externalSubsetDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name, externalSubsetDebug(void *ctxt ATTRIBUTE_UNUSED, const xmlChar *name,
const xmlChar *ExternalID, const xmlChar *SystemID) const xmlChar *ExternalID, const xmlChar *SystemID)
{ {
fprintf(stdout, "SAX.externalSubset(%s,", name); fprintf(stdout, "SAX.externalSubset(%s,", name);
@ -534,7 +534,7 @@ externalSubsetDebug(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
* extra parameters. * extra parameters.
*/ */
static void static void
warningDebug(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) warningDebug(void *ctxt ATTRIBUTE_UNUSED, const char *msg, ...)
{ {
va_list args; va_list args;
@ -554,7 +554,7 @@ warningDebug(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...)
* extra parameters. * extra parameters.
*/ */
static void static void
errorDebug(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) errorDebug(void *ctxt ATTRIBUTE_UNUSED, const char *msg, ...)
{ {
va_list args; va_list args;
@ -574,7 +574,7 @@ errorDebug(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...)
* extra parameters. * extra parameters.
*/ */
static void static void
fatalErrorDebug(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) fatalErrorDebug(void *ctxt ATTRIBUTE_UNUSED, const char *msg, ...)
{ {
va_list args; va_list args;

23
threads.c
View File

@ -102,7 +102,7 @@ static xmlRMutexPtr xmlLibraryLock = NULL;
static void xmlOnceInit(void); static void xmlOnceInit(void);
/** /**
* xmlMutexPtr: * xmlNewMutex:
* *
* xmlNewMutex() is used to allocate a libxml2 token struct for use in * xmlNewMutex() is used to allocate a libxml2 token struct for use in
* synchronizing access to data. * synchronizing access to data.
@ -176,7 +176,7 @@ xmlMutexUnlock(xmlMutexPtr tok ATTRIBUTE_UNUSED)
} }
/** /**
* xmlRNewMutex: * xmlNewRMutex:
* *
* xmlRNewMutex() is used to allocate a reentrant mutex for use in * xmlRNewMutex() is used to allocate a reentrant mutex for use in
* synchronizing access to data. token_r is a re-entrant lock and thus useful * synchronizing access to data. token_r is a re-entrant lock and thus useful
@ -204,7 +204,7 @@ xmlNewRMutex(void)
} }
/** /**
* xmlRFreeMutex: * xmlFreeRMutex:
* @tok: the reentrant mutex * @tok: the reentrant mutex
* *
* xmlRFreeMutex() is used to reclaim resources associated with a * xmlRFreeMutex() is used to reclaim resources associated with a
@ -322,14 +322,6 @@ xmlNewGlobalState(void)
#endif /* LIBXML_THREAD_ENABLED */ #endif /* LIBXML_THREAD_ENABLED */
/**
* xmlGetGlobalState:
*
* xmlGetGlobalState() is called to retrieve the global state for a thread.
*
* Returns the thread global state or NULL in case of error
*/
#ifdef HAVE_WIN32_THREADS #ifdef HAVE_WIN32_THREADS
#if !defined(HAVE_COMPILER_TLS) #if !defined(HAVE_COMPILER_TLS)
typedef struct _xmlGlobalStateCleanupHelperParams typedef struct _xmlGlobalStateCleanupHelperParams
@ -338,7 +330,7 @@ typedef struct _xmlGlobalStateCleanupHelperParams
void *memory; void *memory;
} xmlGlobalStateCleanupHelperParams; } xmlGlobalStateCleanupHelperParams;
void xmlGlobalStateCleanupHelper (void *p) static void xmlGlobalStateCleanupHelper (void *p)
{ {
xmlGlobalStateCleanupHelperParams *params = (xmlGlobalStateCleanupHelperParams *) p; xmlGlobalStateCleanupHelperParams *params = (xmlGlobalStateCleanupHelperParams *) p;
WaitForSingleObject(params->thread, INFINITE); WaitForSingleObject(params->thread, INFINITE);
@ -350,6 +342,13 @@ void xmlGlobalStateCleanupHelper (void *p)
#endif /* HAVE_COMPILER_TLS */ #endif /* HAVE_COMPILER_TLS */
#endif /* HAVE_WIN32_THREADS */ #endif /* HAVE_WIN32_THREADS */
/**
* xmlGetGlobalState:
*
* xmlGetGlobalState() is called to retrieve the global state for a thread.
*
* Returns the thread global state or NULL in case of error
*/
xmlGlobalStatePtr xmlGlobalStatePtr
xmlGetGlobalState(void) xmlGetGlobalState(void)
{ {

15
tree.c
View File

@ -2589,7 +2589,9 @@ xmlFreeNodeList(xmlNodePtr cur) {
if ((cur->children != NULL) && if ((cur->children != NULL) &&
(cur->type != XML_ENTITY_REF_NODE)) (cur->type != XML_ENTITY_REF_NODE))
xmlFreeNodeList(cur->children); xmlFreeNodeList(cur->children);
if ((cur->type == XML_ELEMENT_NODE) && if (((cur->type == XML_ELEMENT_NODE) ||
(cur->type == XML_XINCLUDE_START) ||
(cur->type == XML_XINCLUDE_END)) &&
(cur->properties != NULL)) (cur->properties != NULL))
xmlFreePropList(cur->properties); xmlFreePropList(cur->properties);
if ((cur->type != XML_ELEMENT_NODE) && if ((cur->type != XML_ELEMENT_NODE) &&
@ -2667,7 +2669,10 @@ xmlFreeNode(xmlNodePtr cur) {
if ((cur->children != NULL) && if ((cur->children != NULL) &&
(cur->type != XML_ENTITY_REF_NODE)) (cur->type != XML_ENTITY_REF_NODE))
xmlFreeNodeList(cur->children); xmlFreeNodeList(cur->children);
if ((cur->type == XML_ELEMENT_NODE) && (cur->properties != NULL)) if (((cur->type == XML_ELEMENT_NODE) ||
(cur->type == XML_XINCLUDE_START) ||
(cur->type == XML_XINCLUDE_END)) &&
(cur->properties != NULL))
xmlFreePropList(cur->properties); xmlFreePropList(cur->properties);
if ((cur->type != XML_ELEMENT_NODE) && if ((cur->type != XML_ELEMENT_NODE) &&
(cur->content != NULL) && (cur->content != NULL) &&
@ -4695,7 +4700,7 @@ shadowed:
} }
/** /**
* xmlNewReconciliedNs * xmlNewReconciliedNs:
* @doc: the document * @doc: the document
* @tree: a node expected to hold the new namespace * @tree: a node expected to hold the new namespace
* @ns: the original namespace * @ns: the original namespace
@ -4761,7 +4766,7 @@ xmlNewReconciliedNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) {
} }
/** /**
* xmlReconciliateNs * xmlReconciliateNs:
* @doc: the document * @doc: the document
* @tree: a node defining the subtree to reconciliate * @tree: a node defining the subtree to reconciliate
* *
@ -7459,7 +7464,7 @@ xmlSaveFormatFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding,
} }
/** /**
* xmlSaveFormatFileEnc * xmlSaveFormatFileEnc:
* @filename: the filename or URL to output * @filename: the filename or URL to output
* @cur: the document being saved * @cur: the document being saved
* @encoding: the name of the encoding to use or NULL. * @encoding: the name of the encoding to use or NULL.

9
valid.c
View File

@ -699,7 +699,7 @@ xmlNewElementContent(xmlChar *name, xmlElementContentType type) {
/** /**
* xmlCopyElementContent: * xmlCopyElementContent:
* @content: An element content pointer. * @cur: An element content pointer.
* *
* Build a copy of an element content description. * Build a copy of an element content description.
* *
@ -2226,7 +2226,7 @@ xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) {
} }
/** /**
* xmlRemoveID * xmlRemoveID:
* @doc: the document * @doc: the document
* @attr: the attribute * @attr: the attribute
* *
@ -2507,7 +2507,7 @@ xmlIsRef(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) {
} }
/** /**
* xmlRemoveRef * xmlRemoveRef:
* @doc: the document * @doc: the document
* @attr: the attribute * @attr: the attribute
* *
@ -2829,7 +2829,7 @@ xmlValidateNotationUse(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
} }
/** /**
* xmlIsMixedElement * xmlIsMixedElement:
* @doc: the document * @doc: the document
* @name: the element name * @name: the element name
* *
@ -3367,7 +3367,6 @@ xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
* @elem: the parent * @elem: the parent
* @name: the attribute name * @name: the attribute name
* @value: the attribute value * @value: the attribute value
* @ctxt: the validation context or NULL
* *
* Does the validation related extra step of the normalization of attribute * Does the validation related extra step of the normalization of attribute
* values: * values:

2
xmlIO.c
View File

@ -135,7 +135,7 @@ static int xmlOutputCallbackInitialized = 0;
/** /**
* xmlNormalizeWindowsPath * xmlNormalizeWindowsPath:
* @path: a windows path like "C:/foo/bar" * @path: a windows path like "C:/foo/bar"
* *
* Normalize a Windows path to make an URL from it * Normalize a Windows path to make an URL from it

2
xmllint.c
View File

@ -137,7 +137,7 @@ static const char *output = NULL;
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#ifdef HAVE_FTIME #ifdef HAVE_FTIME
int static int
my_gettimeofday(struct timeval *tvp, void *tzp) my_gettimeofday(struct timeval *tvp, void *tzp)
{ {
struct timeb timebuffer; struct timeb timebuffer;

23
xmlmemory.c
View File

@ -115,10 +115,10 @@ static int xmlMemInitialized = 0;
static MEMHDR *memlist = NULL; static MEMHDR *memlist = NULL;
#endif #endif
void debugmem_tag_error(void *addr); static void debugmem_tag_error(void *addr);
#ifdef MEM_LIST #ifdef MEM_LIST
void debugmem_list_add(MEMHDR *); static void debugmem_list_add(MEMHDR *);
void debugmem_list_delete(MEMHDR *); static void debugmem_list_delete(MEMHDR *);
#endif #endif
#define Mem_Tag_Err(a) debugmem_tag_error(a); #define Mem_Tag_Err(a) debugmem_tag_error(a);
@ -412,7 +412,7 @@ error:
/** /**
* xmlMemoryStrdup: * xmlMemoryStrdup:
* @ptr: the initial string pointer * @str: the initial string pointer
* *
* a strdup() equivalent, with logging of the allocation info. * a strdup() equivalent, with logging of the allocation info.
* *
@ -599,7 +599,7 @@ xmlMemDisplay(FILE *fp)
#ifdef MEM_LIST #ifdef MEM_LIST
void debugmem_list_add(MEMHDR *p) static void debugmem_list_add(MEMHDR *p)
{ {
p->mh_next = memlist; p->mh_next = memlist;
p->mh_prev = NULL; p->mh_prev = NULL;
@ -611,7 +611,7 @@ void debugmem_list_add(MEMHDR *p)
#endif #endif
} }
void debugmem_list_delete(MEMHDR *p) static void debugmem_list_delete(MEMHDR *p)
{ {
if (p->mh_next) if (p->mh_next)
p->mh_next->mh_prev = p->mh_prev; p->mh_next->mh_prev = p->mh_prev;
@ -627,10 +627,12 @@ void debugmem_list_delete(MEMHDR *p)
#endif #endif
/* /*
* debugmem_tag_error : internal error function. * debugmem_tag_error:
*
* internal error function.
*/ */
void debugmem_tag_error(void *p) static void debugmem_tag_error(void *p)
{ {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"Memory tag error occurs :%p \n\t bye\n", p); "Memory tag error occurs :%p \n\t bye\n", p);
@ -673,6 +675,8 @@ xmlMemoryDump(void)
* * * *
****************************************************************/ ****************************************************************/
static int xmlInitMemoryDone = 0;
/** /**
* xmlInitMemory: * xmlInitMemory:
* *
@ -680,9 +684,6 @@ xmlMemoryDump(void)
* *
* Returns 0 on success * Returns 0 on success
*/ */
static int xmlInitMemoryDone = 0;
int int
xmlInitMemory(void) xmlInitMemory(void)
{ {

2
xmlreader.c
View File

@ -571,7 +571,7 @@ xmlTextReaderNodeType(xmlTextReaderPtr reader) {
} }
/** /**
* xmlTextReaderIsEmpty: * xmlTextReaderIsEmptyElement:
* @reader: the xmlTextReaderPtr used * @reader: the xmlTextReaderPtr used
* *
* Check if the current node is empty * Check if the current node is empty

4
xmlregexp.c
View File

@ -2261,13 +2261,15 @@ progress:
************************************************************************/ ************************************************************************/
/** /**
* xmlRegExecCtxtPtr: * xmlRegNewExecCtxt:
* @comp: a precompiled regular expression * @comp: a precompiled regular expression
* @callback: a callback function used for handling progresses in the * @callback: a callback function used for handling progresses in the
* automata matching phase * automata matching phase
* @data: the context data associated to the callback in this context * @data: the context data associated to the callback in this context
* *
* Build a context used for progressive evaluation of a regexp. * Build a context used for progressive evaluation of a regexp.
*
* Returns the new context
*/ */
xmlRegExecCtxtPtr xmlRegExecCtxtPtr
xmlRegNewExecCtxt(xmlRegexpPtr comp, xmlRegExecCallbacks callback, void *data) { xmlRegNewExecCtxt(xmlRegexpPtr comp, xmlRegExecCallbacks callback, void *data) {

16
xmlschemas.c
View File

@ -3930,9 +3930,8 @@ xmlSchemaAttrFixup(xmlSchemaAttributePtr attrDecl,
/** /**
* xmlSchemaParse: * xmlSchemaParse:
* @ctxt: a schema validation context * @ctxt: a schema validation context
* @URL: the location of the schema
* *
* Load, XML parse a schema definition resource and build an internal * parse a schema definition resource and build an internal
* XML Shema struture which can be used to validate instances. * XML Shema struture which can be used to validate instances.
* *WARNING* this interface is highly subject to change * *WARNING* this interface is highly subject to change
* *
@ -4098,16 +4097,13 @@ skip_children:
} }
/** /**
* xmlSchemaParse: * xmlSchemaSetParserErrors:
* @ctxt: a schema validation context * @ctxt: a schema validation context
* @URL: the location of the schema * @err: the error callback
* @warn: the warning callback
* @ctx: contextual data for the callbacks
* *
* Load, XML parse a schema definition resource and build an internal * Set the callback functions used to handle errors for a validation context
* XML Shema struture which can be used to validate instances.
* *WARNING* this interface is highly subject to change
*
* Returns the internal XML Schema structure built from the resource or
* NULL in case of error
*/ */
void void
xmlSchemaSetParserErrors(xmlSchemaParserCtxtPtr ctxt, xmlSchemaSetParserErrors(xmlSchemaParserCtxtPtr ctxt,

2
xmlschemastypes.c
View File

@ -1781,7 +1781,7 @@ xmlSchemaCompareValues(xmlSchemaValPtr x, xmlSchemaValPtr y) {
/** /**
* xmlSchemaValidateFacet: * xmlSchemaValidateFacet:
* @type: the type declaration * @base: the base type
* @facet: the facet to check * @facet: the facet to check
* @value: the lexical repr of the value to validate * @value: the lexical repr of the value to validate
* @val: the precomputed value * @val: the precomputed value

9
xpath.c
View File

@ -3805,7 +3805,7 @@ xmlXPathFreeParserContext(xmlXPathParserContextPtr ctxt) {
************************************************************************/ ************************************************************************/
/** /**
* xmlXPathNodeStringHash: * xmlXPathNodeValHash:
* @node: a node pointer * @node: a node pointer
* *
* Function computing the beginning of the string value of the node, * Function computing the beginning of the string value of the node,
@ -4193,7 +4193,7 @@ xmlXPathCompareNodeSetValue(xmlXPathParserContextPtr ctxt, int inf, int strict,
} }
/** /**
* xmlXPathEqualNodeSetString * xmlXPathEqualNodeSetString:
* @arg: the nodeset object argument * @arg: the nodeset object argument
* @str: the string to compare to. * @str: the string to compare to.
* @neq: flag to show whether for '=' (0) or '!=' (1) * @neq: flag to show whether for '=' (0) or '!=' (1)
@ -4248,7 +4248,7 @@ xmlXPathEqualNodeSetString(xmlXPathObjectPtr arg, const xmlChar * str, int neq)
} }
/** /**
* xmlXPathEqualNodeSetFloat * xmlXPathEqualNodeSetFloat:
* @arg: the nodeset object argument * @arg: the nodeset object argument
* @f: the float to compare to * @f: the float to compare to
* @neq: flag to show whether to compare '=' (0) or '!=' (1) * @neq: flag to show whether to compare '=' (0) or '!=' (1)
@ -4304,7 +4304,7 @@ xmlXPathEqualNodeSetFloat(xmlXPathParserContextPtr ctxt,
/** /**
* xmlXPathEqualNodeSets * xmlXPathEqualNodeSets:
* @arg1: first nodeset object argument * @arg1: first nodeset object argument
* @arg2: second nodeset object argument * @arg2: second nodeset object argument
* @neq: flag to show whether to test '=' (0) or '!=' (1) * @neq: flag to show whether to test '=' (0) or '!=' (1)
@ -7542,7 +7542,6 @@ xmlXPathCompVariableReference(xmlXPathParserContextPtr ctxt) {
/** /**
* xmlXPathIsNodeType: * xmlXPathIsNodeType:
* @ctxt: the XPath Parser context
* @name: a name string * @name: a name string
* *
* Is the name given a NodeType one. * Is the name given a NodeType one.