From d21d721596a51176df77e3dfc75028b462cf924c Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Fri, 20 Feb 2015 09:27:16 -0700 Subject: pp_pack.c: Silence compiler warning This was introduced by 9df874cdaa2f196cc11fbd7b82a85690c243eb9f in changing the name of some static functions. I didn't realize at the time that the function was defined in embed.fnc, as none of the others are, and it was always called with the S_ prefix form. Nor did I notice the compiler warnings. It turns out that the base name of this function is the same as a public function, so I've renamed it to have prefix 'S_my_'. --- pp_pack.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pp_pack.c') diff --git a/pp_pack.c b/pp_pack.c index 0cbe3c4d4b..2d1a208a60 100644 --- a/pp_pack.c +++ b/pp_pack.c @@ -327,8 +327,8 @@ S_utf8_to_bytes(pTHX_ const char **s, const char *end, const char *buf, int buf_ } STATIC char * -S_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) { - PERL_ARGS_ASSERT_BYTES_TO_UNI; +S_my_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) { + PERL_ARGS_ASSERT_MY_BYTES_TO_UTF8; if (UNLIKELY(needs_swap)) { const U8 *p = start + len; @@ -348,7 +348,7 @@ S_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) #define PUSH_BYTES(utf8, cur, buf, len, needs_swap) \ STMT_START { \ if (UNLIKELY(utf8)) \ - (cur) = S_bytes_to_utf8((U8 *) buf, len, (cur), needs_swap); \ + (cur) = my_bytes_to_utf8((U8 *) buf, len, (cur), needs_swap); \ else { \ if (UNLIKELY(needs_swap)) \ S_reverse_copy((char *)(buf), cur, len); \ @@ -386,7 +386,7 @@ STMT_START { \ STMT_START { \ if (utf8) { \ const U8 au8 = (byte); \ - (s) = S_bytes_to_utf8(&au8, 1, (s), 0); \ + (s) = my_bytes_to_utf8(&au8, 1, (s), 0);\ } else *(U8 *)(s)++ = (byte); \ } STMT_END @@ -2640,7 +2640,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist ) len+(endb-buffer)*UTF8_EXPAND); end = start+SvLEN(cat); } - cur = S_bytes_to_utf8(buffer, endb-buffer, cur, 0); + cur = my_bytes_to_utf8(buffer, endb-buffer, cur, 0); } else { if (cur >= end) { *cur = '\0'; -- cgit v1.2.1