Leave no doubt about align_limit_to_full_utf8_characters being internal

diff --git a/expat/lib/internal.h b/expat/lib/internal.h
index 3c5d6e913d6db33600620b2915b5bd027fffa536..e33fdcb0238d727c0c5097481a0548d906dca072 100644 (file)
--- 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 aaafb43f94398ba7fe52d9278ddbb410d547df7b..82f80146da0eeda68596db0ed8918475cd3a3e3c 100644 (file)
--- 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 f28c3efa9763c244b480bdc039e9b7235dae13ca..753580087c70b42c139e604dbd4daaa61058778c 100644 (file)
--- 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 46924c3a0ffad2de391565f0126746da3840d6ad..39b1f6429719b06f2ac3d2e7245bc3d428c8788f 100644 (file)
--- 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 b2b0fa1165ffb9acff3a72eea545377918d6f4cc..72358b75e5974c4bded30758f77ffa1031a568e1 100644 (file)
--- 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) {