shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-04 01:47:02 +03:00
Code

tree: Remove underscores from xmlRegisterCallbacks

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-06-26 14:11:34 +02:00
parent cc0cc2d3b7
commit f505dcaea0
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HTMLparser.c
View File

@ -2376,7 +2376,7 @@ htmlNewDocNoDtD(const xmlChar *URI, const xmlChar *ExternalID) {
return(NULL); return(NULL);
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
} }

6
SAX2.c
View File

@ -1836,7 +1836,7 @@ skip:
} else } else
ret->content = (xmlChar *) intern; ret->content = (xmlChar *) intern;
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(ret); xmlRegisterNodeDefaultValue(ret);
return(ret); return(ret);
} }
@ -1952,7 +1952,7 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
xmlSAX2ErrMemory(ctxt); xmlSAX2ErrMemory(ctxt);
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)ret); xmlRegisterNodeDefaultValue((xmlNodePtr)ret);
if ((ctxt->replaceEntities == 0) && (!ctxt->html)) { if ((ctxt->replaceEntities == 0) && (!ctxt->html)) {
@ -2200,7 +2200,7 @@ xmlSAX2StartElementNs(void *ctx,
return; return;
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(ret); xmlRegisterNodeDefaultValue(ret);
} else { } else {
if (ctxt->dictNames) if (ctxt->dictNames)

4
globals.c
View File

@ -1133,7 +1133,7 @@ xmlThrDefRegisterNodeDefault(xmlRegisterNodeFunc func)
xmlMutexLock(&xmlThrDefMutex); xmlMutexLock(&xmlThrDefMutex);
old = xmlRegisterNodeDefaultValueThrDef; old = xmlRegisterNodeDefaultValueThrDef;
__xmlRegisterCallbacks = 1; xmlRegisterCallbacks = 1;
xmlRegisterNodeDefaultValueThrDef = func; xmlRegisterNodeDefaultValueThrDef = func;
xmlMutexUnlock(&xmlThrDefMutex); xmlMutexUnlock(&xmlThrDefMutex);
@ -1148,7 +1148,7 @@ xmlThrDefDeregisterNodeDefault(xmlDeregisterNodeFunc func)
xmlMutexLock(&xmlThrDefMutex); xmlMutexLock(&xmlThrDefMutex);
old = xmlDeregisterNodeDefaultValueThrDef; old = xmlDeregisterNodeDefaultValueThrDef;
__xmlRegisterCallbacks = 1; xmlRegisterCallbacks = 1;
xmlDeregisterNodeDefaultValueThrDef = func; xmlDeregisterNodeDefaultValueThrDef = func;
xmlMutexUnlock(&xmlThrDefMutex); xmlMutexUnlock(&xmlThrDefMutex);

7
include/private/tree.h
View File

@ -1,13 +1,8 @@
#ifndef XML_TREE_H_PRIVATE__ #ifndef XML_TREE_H_PRIVATE__
#define XML_TREE_H_PRIVATE__ #define XML_TREE_H_PRIVATE__
/*
* Internal variable indicating if a callback has been registered for
* node creation/destruction. It avoids spending a lot of time in locking
* function while checking if the callback exists.
*/
XML_HIDDEN extern int XML_HIDDEN extern int
__xmlRegisterCallbacks; xmlRegisterCallbacks;
XML_HIDDEN int XML_HIDDEN int
xmlSearchNsSafe(xmlNodePtr node, const xmlChar *href, xmlNsPtr *out); xmlSearchNsSafe(xmlNodePtr node, const xmlChar *href, xmlNsPtr *out);

51
tree.c
View File

@ -47,7 +47,12 @@
#include "private/error.h" #include "private/error.h"
#include "private/tree.h" #include "private/tree.h"
int __xmlRegisterCallbacks = 0; /*
* Internal variable indicating whether a callback has been registered
* for node creation/destruction. This avoids looking up thread-local
* data if no callback was ever registered.
*/
int xmlRegisterCallbacks = 0;
/************************************************************************ /************************************************************************
* * * *
@ -878,7 +883,7 @@ xmlNewDtd(xmlDocPtr doc, const xmlChar *name,
doc->extSubset = cur; doc->extSubset = cur;
cur->doc = doc; cur->doc = doc;
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
@ -1001,7 +1006,7 @@ xmlCreateIntSubset(xmlDocPtr doc, const xmlChar *name,
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
@ -1037,7 +1042,7 @@ xmlFreeDtd(xmlDtdPtr cur) {
} }
if (cur->doc != NULL) dict = cur->doc->dict; if (cur->doc != NULL) dict = cur->doc->dict;
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue((xmlNodePtr)cur); xmlDeregisterNodeDefaultValue((xmlNodePtr)cur);
if (cur->children != NULL) { if (cur->children != NULL) {
@ -1118,7 +1123,7 @@ xmlNewDoc(const xmlChar *version) {
*/ */
cur->charset = XML_CHAR_ENCODING_UTF8; cur->charset = XML_CHAR_ENCODING_UTF8;
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
} }
@ -1140,7 +1145,7 @@ xmlFreeDoc(xmlDocPtr cur) {
dict = cur->dict; dict = cur->dict;
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue((xmlNodePtr)cur); xmlDeregisterNodeDefaultValue((xmlNodePtr)cur);
/* /*
@ -1733,7 +1738,7 @@ xmlNewPropInternal(xmlNodePtr node, xmlNsPtr ns,
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr) cur); xmlRegisterNodeDefaultValue((xmlNodePtr) cur);
return (cur); return (cur);
@ -1868,7 +1873,7 @@ xmlNewDocProp(xmlDocPtr doc, const xmlChar *name, const xmlChar *value) {
goto error; goto error;
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
@ -1907,7 +1912,7 @@ xmlFreeProp(xmlAttrPtr cur) {
if (cur->doc != NULL) dict = cur->doc->dict; if (cur->doc != NULL) dict = cur->doc->dict;
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue((xmlNodePtr)cur); xmlDeregisterNodeDefaultValue((xmlNodePtr)cur);
/* Check for ID removal -> leading to invalid references ! */ /* Check for ID removal -> leading to invalid references ! */
@ -2003,7 +2008,7 @@ xmlNewDocPI(xmlDocPtr doc, const xmlChar *name, const xmlChar *content) {
goto error; goto error;
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
@ -2090,7 +2095,7 @@ xmlNewElem(xmlDocPtr doc, xmlNsPtr ns, const xmlChar *name,
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)cur); xmlRegisterNodeDefaultValue((xmlNodePtr)cur);
return(cur); return(cur);
@ -2252,7 +2257,7 @@ xmlNewDocFragment(xmlDocPtr doc) {
cur->doc = doc; cur->doc = doc;
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
} }
@ -2288,7 +2293,7 @@ xmlNewText(const xmlChar *content) {
goto error; goto error;
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
@ -2389,7 +2394,7 @@ xmlNewEntityRef(xmlDocPtr doc, xmlChar *name) {
cur->doc = doc; cur->doc = doc;
cur->name = name; cur->name = name;
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
@ -2490,7 +2495,7 @@ xmlNewReference(const xmlDoc *doc, const xmlChar *name) {
cur->last = (xmlNodePtr) ent; cur->last = (xmlNodePtr) ent;
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
@ -2550,7 +2555,7 @@ xmlNewTextLen(const xmlChar *content, int len) {
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
} }
@ -2606,7 +2611,7 @@ xmlNewComment(const xmlChar *content) {
goto error; goto error;
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
@ -2648,7 +2653,7 @@ xmlNewCDataBlock(xmlDocPtr doc, const xmlChar *content, int len) {
} }
} }
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue(cur); xmlRegisterNodeDefaultValue(cur);
return(cur); return(cur);
} }
@ -3636,7 +3641,7 @@ xmlFreeNodeList(xmlNodePtr cur) {
cur->prev = NULL; cur->prev = NULL;
cur->next = NULL; cur->next = NULL;
} else { } else {
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue(cur); xmlDeregisterNodeDefaultValue(cur);
if (((cur->type == XML_ELEMENT_NODE) || if (((cur->type == XML_ELEMENT_NODE) ||
@ -3715,7 +3720,7 @@ xmlFreeNode(xmlNodePtr cur) {
return; return;
} }
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue(cur); xmlDeregisterNodeDefaultValue(cur);
if (cur->doc != NULL) dict = cur->doc->dict; if (cur->doc != NULL) dict = cur->doc->dict;
@ -4323,7 +4328,7 @@ xmlStaticCopyNode(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent,
} }
out: out:
if ((__xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlRegisterNodeDefaultValue))
xmlRegisterNodeDefaultValue((xmlNodePtr)ret); xmlRegisterNodeDefaultValue((xmlNodePtr)ret);
return(ret); return(ret);
@ -9898,7 +9903,7 @@ xmlRegisterNodeDefault(xmlRegisterNodeFunc func)
{ {
xmlRegisterNodeFunc old = xmlRegisterNodeDefaultValue; xmlRegisterNodeFunc old = xmlRegisterNodeDefaultValue;
__xmlRegisterCallbacks = 1; xmlRegisterCallbacks = 1;
xmlRegisterNodeDefaultValue = func; xmlRegisterNodeDefaultValue = func;
return(old); return(old);
} }
@ -9918,7 +9923,7 @@ xmlDeregisterNodeDefault(xmlDeregisterNodeFunc func)
{ {
xmlDeregisterNodeFunc old = xmlDeregisterNodeDefaultValue; xmlDeregisterNodeFunc old = xmlDeregisterNodeDefaultValue;
__xmlRegisterCallbacks = 1; xmlRegisterCallbacks = 1;
xmlDeregisterNodeDefaultValue = func; xmlDeregisterNodeDefaultValue = func;
return(old); return(old);
} }

8
xmlreader.c
View File

@ -259,7 +259,7 @@ xmlTextReaderFreeProp(xmlTextReaderPtr reader, xmlAttrPtr cur) {
dict = NULL; dict = NULL;
if (cur == NULL) return; if (cur == NULL) return;
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue((xmlNodePtr) cur); xmlDeregisterNodeDefaultValue((xmlNodePtr) cur);
if (cur->children != NULL) if (cur->children != NULL)
@ -350,7 +350,7 @@ xmlTextReaderFreeNodeList(xmlTextReaderPtr reader, xmlNodePtr cur) {
/* unroll to speed up freeing the document */ /* unroll to speed up freeing the document */
if (cur->type != XML_DTD_NODE) { if (cur->type != XML_DTD_NODE) {
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue(cur); xmlDeregisterNodeDefaultValue(cur);
if (((cur->type == XML_ELEMENT_NODE) || if (((cur->type == XML_ELEMENT_NODE) ||
@ -437,7 +437,7 @@ xmlTextReaderFreeNode(xmlTextReaderPtr reader, xmlNodePtr cur) {
cur->children = NULL; cur->children = NULL;
} }
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue(cur); xmlDeregisterNodeDefaultValue(cur);
if (((cur->type == XML_ELEMENT_NODE) || if (((cur->type == XML_ELEMENT_NODE) ||
@ -490,7 +490,7 @@ xmlTextReaderFreeDoc(xmlTextReaderPtr reader, xmlDocPtr cur) {
if (cur == NULL) return; if (cur == NULL) return;
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) if ((xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue((xmlNodePtr) cur); xmlDeregisterNodeDefaultValue((xmlNodePtr) cur);
/* /*