_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG: Use utf8_to_uv

This is the new preferred form
Perl · Jan 7, 2025 · c362135 · c362135
1 parent 7911101
commit c362135
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/perl.h b/perl.h
@@ -7557,13 +7557,11 @@ the plain locale pragma without a parameter (S<C<use locale>>) is in effect.
 #    define _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(s, send)                 \
         STMT_START { /* Check if to warn before doing the conversion work */\
             if (! IN_UTF8_CTYPE_LOCALE && ckWARN(WARN_LOCALE)) {            \
-                UV cp = utf8_to_uvchr_buf((U8 *) (s), (U8 *) (send), NULL); \
+                UV cp;                                                      \
+                utf8_to_uv((U8 *) (s), (U8 *) (send), &cp, NULL);           \
                 Perl_warner(aTHX_ packWARN(WARN_LOCALE),                    \
                     "Wide character (U+%" UVXf ") in %s",                   \
-                    (cp == 0)                                               \
-                     ? UNICODE_REPLACEMENT                                  \
-                     : (UV) cp,                                             \
-                    OP_DESC(PL_op));                                        \
+                    cp, OP_DESC(PL_op));                                    \
             }                                                               \
         }  STMT_END