organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-05 13:14:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

Merge pull request #733 from libexpat/fix-ci

Browse source 
runtests.c: Initialize storage prior to usage (cppcheck 2.11) + autotools: Sync CMake templates with CMake 3.25
This commit is contained in:
Sebastian Pipping 2023-07-26 18:05:59 +02:00 • committed by GitHub
commit 20293f2ad2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
expat/Changes
View file

@ -5,7 +5,7 @@ NOTE: We are looking for help with a few things:
Release 2.5.1 xxx xxxxxxx xx xxxx
Other changes:
#673 examples: Add new example "element_declarations.c"
#678 Autotools: Sync CMake templates with CMake 3.23
#678 #706 #733 Autotools: Sync CMake templates with CMake 3.25
Infrastructure:
#698 #721 CI: Resolve some Travis CI leftovers

2
expat/cmake/autotools/expat.cmake
View file

@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
message(FATAL_ERROR "CMake >= 2.8.3 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.8.3...3.24)
cmake_policy(VERSION 2.8.3...3.25)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------

3
expat/tests/runtests.c
View file

@ -6814,10 +6814,11 @@ START_TEST(test_nested_entity_suspend) {
const XML_Char *const expected = XCS("start") XCS("e3 head") XCS("e2 head")
XCS("e1") XCS("e2 tail") XCS("e3 tail") XCS("end");
CharData storage;
CharData_Init(&storage);
XML_Parser parser = XML_ParserCreate(NULL);
ParserPlusStorage parserPlusStorage = {parser, &storage};
CharData_Init(&storage);
XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
XML_SetCommentHandler(parser, accumulate_and_suspend_comment_handler);
XML_SetUserData(parser, &parserPlusStorage);