Merge utf8_to_uvchr_buf() and its helper

The helper adds no value

Author: khwilliamson

embed.fnc

@@ -3741,10 +3741,6 @@ AMdip	|UV	|utf8_to_uvchr_buf					\
 				|NN const U8 *s 			\
 				|NN const U8 *send			\
 				|NULLOK STRLEN *retlen
-Cip	|UV	|utf8_to_uvchr_buf_helper				\
-				|NN const U8 *s 			\
-				|NN const U8 *send			\
-				|NULLOK STRLEN *retlen
 CDbdp	|UV	|utf8_to_uvuni	|NN const U8 *s 			\
 				|NULLOK STRLEN *retlen
 : Used in perly.y

embed.h

@@ -863,7 +863,6 @@
 # define utf8_to_bytes_new_pv(a,b,c)            Perl_utf8_to_bytes_new_pv(aTHX,a,b,c)
 # define utf8_to_bytes_overwrite(a,b)           Perl_utf8_to_bytes_overwrite(aTHX,a,b)
 # define utf8_to_bytes_temp_pv(a,b)             Perl_utf8_to_bytes_temp_pv(aTHX,a,b)
-# define utf8_to_uvchr_buf_helper(a,b,c)        Perl_utf8_to_uvchr_buf_helper(aTHX_ a,b,c)
 # define utf8n_to_uvchr_msgs                    Perl_utf8n_to_uvchr_msgs
 # define uvchr_to_utf8(a,b)                     Perl_uvchr_to_utf8(aTHX,a,b)
 # define uvchr_to_utf8_flags(a,b,c)             Perl_uvchr_to_utf8_flags(aTHX,a,b,c)

inline.h

@@ -3141,15 +3141,6 @@ PERL_STATIC_INLINE UV
 Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
 {
     PERL_ARGS_ASSERT_UTF8_TO_UVCHR_BUF;
-
-    return utf8_to_uvchr_buf_helper(s, send, retlen);
-}
-
-PERL_STATIC_INLINE UV
-Perl_utf8_to_uvchr_buf_helper(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
-{
-    PERL_ARGS_ASSERT_UTF8_TO_UVCHR_BUF_HELPER;
-
     assert(s < send);
 
     if (! ckWARN_d(WARN_UTF8)) {

proto.h

@@ -148,8 +148,12 @@ typedef enum {
         Perl_uvchr_to_utf8_flags_msgs(aTHX, d, u, f, 0)
 #define Perl_uvchr_to_utf8_flags_msgs(mTHX, d, u, f , m)                        \
         Perl_uvoffuni_to_utf8_flags_msgs(aTHX_ d, NATIVE_TO_UNI(u), f, m)
-#define utf8_to_uvchr_buf(s, e, lenp)                                           \
-            utf8_to_uvchr_buf_helper((const U8 *) (s), (const U8 *) e, lenp)
+
+/* This is needed to cast the parameters for all those calls that had them
+ * improperly as chars */
+#define utf8_to_uvchr_buf(s, e, lenp)                                          \
+    Perl_utf8_to_uvchr_buf(aTHX_ (const U8 *) (s), (const U8 *) e, lenp)
+
 #define utf8n_to_uvchr(s, len, lenp, flags)                                    \
                                 utf8n_to_uvchr_error(s, len, lenp, flags, 0)
 #define utf8n_to_uvchr_error(s, len, lenp, flags, errors)                      \