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

Refactor to get rid of data/code pointer conversion warning

Browse source
This commit is contained in:
Rhodri James 2017-06-06 19:20:33 +01:00 • committed by Sebastian Pipping
parent b2ba9d7911
commit 19d0115623
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
expat/tests/runtests.c
View file

@ -5269,6 +5269,13 @@ END_TEST
/* Test that the unknown encoding handler with map entries that expect
* conversion but no conversion function is faulted
*/
static int XMLCALL
failing_converter(void *UNUSED_P(data), const char *UNUSED_P(s))
{
/* Always claim to have failed */
return -1;
}
static int XMLCALL
BadEncodingHandler(void *data,
const XML_Char *UNUSED_P(encoding),
@ -5281,7 +5288,7 @@ BadEncodingHandler(void *data,
for (; i < 256; ++i)
info->map[i] = -2; /* A 2-byte sequence */
info->data = NULL;
info->convert = (int (XMLCALL *)(void *, const char *))data;
info->convert = (data == NULL) ? NULL : failing_converter;
info->release = NULL;
return XML_STATUS_OK;
}
@ -5304,13 +5311,6 @@ START_TEST(test_missing_encoding_conversion_fn)
}
END_TEST
static int XMLCALL
failing_converter(void *UNUSED_P(data), const char *UNUSED_P(s))
{
/* Always claim to have failed */
return -1;
}
START_TEST(test_failing_encoding_conversion_fn)
{
const char *text =
@ -5318,7 +5318,8 @@ START_TEST(test_failing_encoding_conversion_fn)
"<doc>\x81</doc>";
XML_SetUnknownEncodingHandler(parser, BadEncodingHandler,
(void *)failing_converter);
/* Anything non-NULL will do here */
(void *)(intptr_t)1);
/* BadEncodingHandler sets up an encoding with every top-bit-set
* character introducing a two-byte sequence. For this, it
* requires a convert function. The above function call passes