From 8711ee3054c6f288bdd35351d164d302fac77fff Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 23 Aug 2017 17:33:39 +0200 Subject: [PATCH] Leave no doubt about align_limit_to_full_utf8_characters being internal --- expat/lib/internal.h | 2 +- expat/lib/libexpat.def | 2 +- expat/lib/libexpatw.def | 2 +- expat/lib/xmltok.c | 4 ++-- expat/tests/runtests.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/expat/lib/internal.h b/expat/lib/internal.h index 3c5d6e91..e33fdcb0 100644 --- a/expat/lib/internal.h +++ b/expat/lib/internal.h @@ -116,7 +116,7 @@ extern "C" { void -align_limit_to_full_utf8_characters(const char * from, const char ** fromLimRef); +_INTERNAL_trim_to_complete_utf8_characters(const char * from, const char ** fromLimRef); #ifdef __cplusplus diff --git a/expat/lib/libexpat.def b/expat/lib/libexpat.def index aaafb43f..82f80146 100644 --- a/expat/lib/libexpat.def +++ b/expat/lib/libexpat.def @@ -74,4 +74,4 @@ EXPORTS ; added with version 2.1.1 ; XML_GetAttributeInfo @66 XML_SetHashSalt @67@ - align_limit_to_full_utf8_characters @68@ \ No newline at end of file + _INTERNAL_trim_to_complete_utf8_characters @68@ \ No newline at end of file diff --git a/expat/lib/libexpatw.def b/expat/lib/libexpatw.def index f28c3efa..75358008 100644 --- a/expat/lib/libexpatw.def +++ b/expat/lib/libexpatw.def @@ -74,4 +74,4 @@ EXPORTS ; added with version 2.1.1 ; XML_GetAttributeInfo @66 XML_SetHashSalt @67@ - align_limit_to_full_utf8_characters @68@ + _INTERNAL_trim_to_complete_utf8_characters @68@ diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c index 46924c3a..39b1f642 100644 --- a/expat/lib/xmltok.c +++ b/expat/lib/xmltok.c @@ -363,7 +363,7 @@ enum { /* UTF8_cvalN is value of masked first byte of N byte sequence */ }; void -align_limit_to_full_utf8_characters(const char * from, const char ** fromLimRef) +_INTERNAL_trim_to_complete_utf8_characters(const char * from, const char ** fromLimRef) { const char * fromLim = *fromLimRef; size_t walked = 0; @@ -416,7 +416,7 @@ utf8_toUtf8(const ENCODING *UNUSED_P(enc), /* Avoid copying partial characters (from incomplete input). */ { const char * const fromLimBefore = fromLim; - align_limit_to_full_utf8_characters(*fromP, &fromLim); + _INTERNAL_trim_to_complete_utf8_characters(*fromP, &fromLim); if (fromLim < fromLimBefore) { input_incomplete = true; } diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index b2b0fa11..72358b75 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -757,7 +757,7 @@ START_TEST(test_utf8_auto_align) const char * const fromLimInitially = fromLim; ptrdiff_t actualMovementInChars; - align_limit_to_full_utf8_characters(cases[i].input, &fromLim); + _INTERNAL_trim_to_complete_utf8_characters(cases[i].input, &fromLim); actualMovementInChars = (fromLim - fromLimInitially); if (actualMovementInChars != cases[i].expectedMovementInChars) {