generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-16 15:01:15 +02:00
Code Issues Projects Releases Wiki Activity

chore(expat): Upgrade to expat 2.7.1

Browse Source
This commit is contained in:
Matej Kenda 2025-04-01 19:40:24 +02:00
parent 3e7144957a
commit 5bbfdc8b53
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XML/src/expat.h
View File

@ -1068,7 +1068,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
*/ */
#define XML_MAJOR_VERSION 2 #define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 7 #define XML_MINOR_VERSION 7
#define XML_MICRO_VERSION 0 #define XML_MICRO_VERSION 1
#ifdef __cplusplus #ifdef __cplusplus
} }

5
XML/src/internal.h
View File

@ -28,7 +28,7 @@
Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net> Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net> Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net> Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com> Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
Copyright (c) 2019 David Loffredo <loffredo@steptools.com> Copyright (c) 2019 David Loffredo <loffredo@steptools.com>
Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com>
@ -127,6 +127,9 @@
# elif ULONG_MAX == 18446744073709551615u // 2^64-1 # elif ULONG_MAX == 18446744073709551615u // 2^64-1
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld" # define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu" # define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
# elif defined(EMSCRIPTEN) // 32bit mode Emscripten
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "zu"
# else # else
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d" # define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u" # define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"

16
XML/src/xmlparse.cpp
View File

@ -1,4 +1,4 @@
/* 7d6840a33c250b74adb0ba295d6ec818dccebebaffc8c3ed27d0b29c28adbeb3 (2.7.0+) /* d19ae032c224863c1527ba44d228cc34b99192c3a4c5a27af1f4e054d45ee031 (2.7.1+)
__ __ _ __ __ _
___\ \/ /_ __ __ _| |_ ___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __| / _ \\ /| '_ \ / _` | __|
@ -3420,12 +3420,13 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
break; break;
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */
} }
*eventPP = s = next;
switch (parser->m_parsingStatus.parsing) { switch (parser->m_parsingStatus.parsing) {
case XML_SUSPENDED: case XML_SUSPENDED:
*eventPP = next;
*nextPtr = next; *nextPtr = next;
return XML_ERROR_NONE; return XML_ERROR_NONE;
case XML_FINISHED: case XML_FINISHED:
*eventPP = next;
return XML_ERROR_ABORTED; return XML_ERROR_ABORTED;
case XML_PARSING: case XML_PARSING:
if (parser->m_reenter) { if (parser->m_reenter) {
@ -3434,6 +3435,7 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
} }
/* Fall through */ /* Fall through */
default:; default:;
*eventPP = s = next;
} }
} }
/* not reached */ /* not reached */
@ -4350,12 +4352,13 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */
} }
*eventPP = s = next;
switch (parser->m_parsingStatus.parsing) { switch (parser->m_parsingStatus.parsing) {
case XML_SUSPENDED: case XML_SUSPENDED:
*eventPP = next;
*nextPtr = next; *nextPtr = next;
return XML_ERROR_NONE; return XML_ERROR_NONE;
case XML_FINISHED: case XML_FINISHED:
*eventPP = next;
return XML_ERROR_ABORTED; return XML_ERROR_ABORTED;
case XML_PARSING: case XML_PARSING:
if (parser->m_reenter) { if (parser->m_reenter) {
@ -4363,6 +4366,7 @@ doCdataSection(XML_Parser parser, const ENCODING *enc, const char **startPtr,
} }
/* Fall through */ /* Fall through */
default:; default:;
*eventPP = s = next;
} }
} }
/* not reached */ /* not reached */
@ -5969,12 +5973,13 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
default: default:
return XML_ERROR_JUNK_AFTER_DOC_ELEMENT; return XML_ERROR_JUNK_AFTER_DOC_ELEMENT;
} }
parser->m_eventPtr = s = next;
switch (parser->m_parsingStatus.parsing) { switch (parser->m_parsingStatus.parsing) {
case XML_SUSPENDED: case XML_SUSPENDED:
parser->m_eventPtr = next;
*nextPtr = next; *nextPtr = next;
return XML_ERROR_NONE; return XML_ERROR_NONE;
case XML_FINISHED: case XML_FINISHED:
parser->m_eventPtr = next;
return XML_ERROR_ABORTED; return XML_ERROR_ABORTED;
case XML_PARSING: case XML_PARSING:
if (parser->m_reenter) { if (parser->m_reenter) {
@ -5982,6 +5987,7 @@ epilogProcessor(XML_Parser parser, const char *s, const char *end,
} }
/* Fall through */ /* Fall through */
default:; default:;
parser->m_eventPtr = s = next;
} }
} }
} }
@ -8263,7 +8269,7 @@ entityTrackingReportStats(XML_Parser rootParser, ENTITY *entity,
(void *)rootParser, rootParser->m_entity_stats.countEverOpened, (void *)rootParser, rootParser->m_entity_stats.countEverOpened,
rootParser->m_entity_stats.currentDepth, rootParser->m_entity_stats.currentDepth,
rootParser->m_entity_stats.maximumDepthSeen, rootParser->m_entity_stats.maximumDepthSeen,
(rootParser->m_entity_stats.currentDepth - 1) * 2, "", ((int)rootParser->m_entity_stats.currentDepth - 1) * 2, "",
entity->is_param ? "%" : "&", entityName, action, entity->textLen, entity->is_param ? "%" : "&", entityName, action, entity->textLen,
sourceLine); sourceLine);
} }