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

parser: Don't use deprecated xmlCopyChar

Browse Source
This commit is contained in:
Nick Wellnhofer
2024-07-02 04:02:16 +02:00
parent 751ba00e00
commit 30ef77554b
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HTMLparser.c
View File

@ -289,9 +289,9 @@ htmlNodeInfoPop(htmlParserCtxtPtr ctxt)
#define CUR_CHAR(l) htmlCurrentChar(ctxt, &l) #define CUR_CHAR(l) htmlCurrentChar(ctxt, &l)
#define COPY_BUF(l,b,i,v) \ #define COPY_BUF(b, i, v) \
if (l == 1) b[i++] = v; \ if (v < 0x80) b[i++] = v; \
else i += xmlCopyChar(l,&b[i],v) else i += xmlCopyCharMultiByte(&b[i],v)
/** /**
* htmlFindEncoding: * htmlFindEncoding:
@ -3034,7 +3034,7 @@ htmlParseScript(htmlParserCtxtPtr ctxt) {
} }
} }
if (IS_CHAR(cur)) { if (IS_CHAR(cur)) {
COPY_BUF(l,buf,nbchar,cur); COPY_BUF(buf,nbchar,cur);
} else { } else {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in CDATA 0x%X\n", cur); "Invalid char in CDATA 0x%X\n", cur);
@ -3099,7 +3099,7 @@ htmlParseCharDataInternal(htmlParserCtxtPtr ctxt, int readahead) {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in CDATA 0x%X\n", cur); "Invalid char in CDATA 0x%X\n", cur);
} else { } else {
COPY_BUF(l,buf,nbchar,cur); COPY_BUF(buf,nbchar,cur);
} }
NEXTL(l); NEXTL(l);
if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) {
@ -3298,7 +3298,7 @@ htmlParsePI(htmlParserCtxtPtr ctxt) {
buf = tmp; buf = tmp;
} }
if (IS_CHAR(cur)) { if (IS_CHAR(cur)) {
COPY_BUF(l,buf,len,cur); COPY_BUF(buf,len,cur);
} else { } else {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in processing instruction " "Invalid char in processing instruction "
@ -3420,7 +3420,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
buf = tmp; buf = tmp;
} }
if (IS_CHAR(q)) { if (IS_CHAR(q)) {
COPY_BUF(ql,buf,len,q); COPY_BUF(buf,len,q);
} else { } else {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in comment 0x%X\n", q); "Invalid char in comment 0x%X\n", q);

1
include/libxml/parserInternals.h
View File

@ -620,6 +620,7 @@ XMLPUBFUN int xmlCurrentChar (xmlParserCtxtPtr ctxt,
int *len); int *len);
XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out, XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out,
int val); int val);
XML_DEPRECATED
XMLPUBFUN int xmlCopyChar (int len, XMLPUBFUN int xmlCopyChar (int len,
xmlChar *out, xmlChar *out,
int val); int val);

2
parserInternals.c
View File

@ -1056,6 +1056,8 @@ xmlCopyCharMultiByte(xmlChar *out, int val) {
* @out: pointer to an array of xmlChar * @out: pointer to an array of xmlChar
* @val: the char value * @val: the char value
* *
* DEPRECATED: Don't use.
*
* append the char value in the array * append the char value in the array
* *
* Returns the number of xmlChar written * Returns the number of xmlChar written

1
python/generator.py
View File

@ -303,6 +303,7 @@ deprecated_funcs = {
'xmlCheckLanguageID': True, 'xmlCheckLanguageID': True,
'xmlCleanupCharEncodingHandlers': True, 'xmlCleanupCharEncodingHandlers': True,
'xmlCleanupGlobals': True, 'xmlCleanupGlobals': True,
'xmlCopyChar': True,
'xmlDefaultSAXHandlerInit': True, 'xmlDefaultSAXHandlerInit': True,
'xmlDictCleanup': True, 'xmlDictCleanup': True,
'xmlFileMatch': True, 'xmlFileMatch': True,

10
xpath.c
View File

@ -2198,9 +2198,9 @@ xmlXPathPopExternal (xmlXPathParserContextPtr ctxt) {
#define CUR_PTR ctxt->cur #define CUR_PTR ctxt->cur
#define CUR_CHAR(l) xmlXPathCurrentChar(ctxt, &l) #define CUR_CHAR(l) xmlXPathCurrentChar(ctxt, &l)
#define COPY_BUF(l,b,i,v) \ #define COPY_BUF(b, i, v) \
if (l == 1) b[i++] = v; \ if (v < 0x80) b[i++] = v; \
else i += xmlCopyChar(l,&b[i],v) else i += xmlCopyCharMultiByte(&b[i],v)
#define NEXTL(l) ctxt->cur += l #define NEXTL(l) ctxt->cur += l
@ -8772,7 +8772,7 @@ xmlXPathParseNameComplex(xmlXPathParserContextPtr ctxt, int qualified) {
(c == '_') || ((qualified) && (c == ':')) || (c == '_') || ((qualified) && (c == ':')) ||
(IS_COMBINING(c)) || (IS_COMBINING(c)) ||
(IS_EXTENDER(c)))) { (IS_EXTENDER(c)))) {
COPY_BUF(l,buf,len,c); COPY_BUF(buf,len,c);
NEXTL(l); NEXTL(l);
c = CUR_CHAR(l); c = CUR_CHAR(l);
if (len >= XML_MAX_NAMELEN) { if (len >= XML_MAX_NAMELEN) {
@ -8812,7 +8812,7 @@ xmlXPathParseNameComplex(xmlXPathParserContextPtr ctxt, int qualified) {
} }
buffer = tmp; buffer = tmp;
} }
COPY_BUF(l,buffer,len,c); COPY_BUF(buffer,len,c);
NEXTL(l); NEXTL(l);
c = CUR_CHAR(l); c = CUR_CHAR(l);
} }