organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-07 22:19:12 +00:00
Code Issues1 Projects Releases Wiki Activity Actions

Merge pull request from libexpat/clang-tidy-misc-no-recursion

Browse source 
Address clang-tidy warning `misc-no-recursion`
This commit is contained in:
Sebastian Pipping 2025-03-31 01:03:21 +02:00 • committed by GitHub
commit 69d6c054c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 9 deletions

2
expat/Changes
View file

@ -41,7 +41,7 @@ Release 2.7.2 ??? ????? ?? ????
Other changes: Other changes:
#994 docs: Drop AppVeyor badge #994 docs: Drop AppVeyor badge
#1000 tests: Fix portable_strndup #1000 tests: Fix portable_strndup
#999 Address more clang-tidy warnings #999 #1001 Address more clang-tidy warnings
Special thanks to: Special thanks to:
Alexander Bluhm Alexander Bluhm

1
expat/apply-clang-tidy.sh
View file

@ -35,6 +35,7 @@ cd "$(dirname "$(type -P "$0")")"
checks_to_enable=( checks_to_enable=(
bugprone-narrowing-conversions bugprone-narrowing-conversions
bugprone-suspicious-string-compare bugprone-suspicious-string-compare
misc-no-recursion
readability-avoid-const-params-in-decls readability-avoid-const-params-in-decls
readability-named-parameter readability-named-parameter
) )

23
expat/lib/xmlparse.c
View file

@ -627,10 +627,10 @@ static void entityTrackingOnOpen(XML_Parser parser, ENTITY *entity,
int sourceLine); int sourceLine);
static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity, static void entityTrackingOnClose(XML_Parser parser, ENTITY *entity,
int sourceLine); int sourceLine);
#endif /* XML_GE == 1 */
static XML_Parser getRootParserOf(XML_Parser parser, static XML_Parser getRootParserOf(XML_Parser parser,
unsigned int *outLevelDiff); unsigned int *outLevelDiff);
#endif /* XML_GE == 1 */
static unsigned long getDebugLevel(const char *variableName, static unsigned long getDebugLevel(const char *variableName,
unsigned long defaultDebugLevel); unsigned long defaultDebugLevel);
@ -1015,9 +1015,10 @@ generate_hash_secret_salt(XML_Parser parser) {
static unsigned long static unsigned long
get_hash_secret_salt(XML_Parser parser) { get_hash_secret_salt(XML_Parser parser) {
if (parser->m_parentParser != NULL) const XML_Parser rootParser = getRootParserOf(parser, NULL);
return get_hash_secret_salt(parser->m_parentParser); assert(! rootParser->m_parentParser);
return parser->m_hash_secret_salt;
return rootParser->m_hash_secret_salt;
} }
static enum XML_Error static enum XML_Error
@ -2017,12 +2018,14 @@ int XMLCALL
XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt) { XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt) {
if (parser == NULL) if (parser == NULL)
return 0; return 0;
if (parser->m_parentParser)
return XML_SetHashSalt(parser->m_parentParser, hash_salt); const XML_Parser rootParser = getRootParserOf(parser, NULL);
assert(! rootParser->m_parentParser);
/* block after XML_Parse()/XML_ParseBuffer() has been called */ /* block after XML_Parse()/XML_ParseBuffer() has been called */
if (parserBusy(parser)) if (parserBusy(rootParser))
return 0; return 0;
parser->m_hash_secret_salt = hash_salt; rootParser->m_hash_secret_salt = hash_salt;
return 1; return 1;
} }
@ -8288,6 +8291,8 @@ entityTrackingOnClose(XML_Parser originParser, ENTITY *entity, int sourceLine) {
rootParser->m_entity_stats.currentDepth--; rootParser->m_entity_stats.currentDepth--;
} }
#endif /* XML_GE == 1 */
static XML_Parser static XML_Parser
getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) { getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
XML_Parser rootParser = parser; XML_Parser rootParser = parser;
@ -8303,6 +8308,8 @@ getRootParserOf(XML_Parser parser, unsigned int *outLevelDiff) {
return rootParser; return rootParser;
} }
#if XML_GE == 1
const char * const char *
unsignedCharToPrintable(unsigned char c) { unsignedCharToPrintable(unsigned char c) {
switch (c) { switch (c) {