Followup on #19779: make the helper function static,

and rename it for paranoia reasons.

p4raw-id: //depot/perl@19781

1 files changed, 5 insertions, 4 deletions

diff --git a/sv.c b/sv.c
index ed37411e5d..9d6948e948 100644
--- a/sv.c
+++ b/sv.c
@@ -8431,7 +8431,7 @@ Perl_sv_vsetpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
     sv_vcatpvfn(sv, pat, patlen, args, svargs, svmax, maybe_tainted);
 }
 
-/* strnchr(): private function for use in sv_vcatpvfn()
+/* my_strnchr(): private function for use in sv_vcatpvfn()
  *
  * Like strchr(), but allows to use strings that are not null-terminated.
  * The string length must be given instead and it _must_ be correct, as
@@ -8439,8 +8439,9 @@ Perl_sv_vsetpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
  * This would also allow to explicitly search for '\0' characters.
  */
 
-static const char *
-strnchr(const char* s, int c, size_t n)
+STATIC
+const char *
+S_my_strnchr(const char* s, int c, size_t n)
 {
     if (s)
 	for (; n > 0; n--, s++)
@@ -9351,7 +9352,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	/* to a null-terminated string. E.g. with the format "%-10c", eptr  */
 	/* points to c (a single char on the stack), which makes strchr()   */
 	/* run amok over the stack until it eventually hits '\n' or '\0'.   */
-	if (left && ckWARN(WARN_PRINTF) && strnchr(eptr, '\n', elen) && 
+	if (left && ckWARN(WARN_PRINTF) && my_strnchr(eptr, '\n', elen) && 
 	    (PL_op->op_type == OP_PRTF || PL_op->op_type == OP_SPRINTF)) 
 	    Perl_warner(aTHX_ packWARN(WARN_PRINTF),
 		"Newline in left-justified string for %sprintf",