X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=toke.c;h=98210a010f518b7d00ca2f002a55e548367b45cb;hb=188ff3c1f17467ccacb0b31f3e13fd49b5b438a7;hp=672acb71bfbc58360989dccaf9607ce454c4ba0b;hpb=3ae08724085c050ef6bd2c7af042aa714c2ad9d9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/toke.c b/toke.c
index 672acb7..98210a0 100644
--- a/toke.c
+++ b/toke.c
@@ -28,6 +28,10 @@
 static char ident_too_long[] = "Identifier too long";
 
 static void restore_rsfp(pTHXo_ void *f);
+#ifndef PERL_NO_UTF16_FILTER
+static I32 utf16_textfilter(pTHXo_ int idx, SV *sv, int maxlen);
+static I32 utf16rev_textfilter(pTHXo_ int idx, SV *sv, int maxlen);
+#endif
 
 #define XFAKEBRACK 128
 #define XENUMMASK 127
@@ -326,36 +330,6 @@ S_cr_textfilter(pTHX_ int idx, SV *sv, int maxlen)
 }
 #endif
 
-#ifndef PERL_NO_UTF16_FILTER
-STATIC I32
-S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen)
-{
-    I32 count = FILTER_READ(idx+1, sv, maxlen);
-    if (count) {
-	U8* tmps;
-	U8* tend;
-	New(898, tmps, SvCUR(sv) * 3 / 2 + 1, U8);
-	tend = utf16_to_utf8((U16*)SvPVX(sv), tmps, SvCUR(sv));
-	sv_usepvn(sv, (char*)tmps, tend - tmps);
-    }
-    return count;
-}
-
-STATIC I32
-S_utf16rev_textfilter(pTHX_ int idx, SV *sv, int maxlen)
-{
-    I32 count = FILTER_READ(idx+1, sv, maxlen);
-    if (count) {
-	U8* tmps;
-	U8* tend;
-	New(898, tmps, SvCUR(sv) * 3 / 2 + 1, U8);
-	tend = utf16_to_utf8_reversed((U16*)SvPVX(sv), tmps, SvCUR(sv));
-	sv_usepvn(sv, (char*)tmps, tend - tmps);
-    }
-    return count;
-}
-#endif
-
 /*
  * Perl_lex_start
  * Initialize variables.  Uses the Perl save_stack to save its state (for
@@ -2545,7 +2519,7 @@ Perl_yylex(pTHX)
 		}
 	    } 
 	    if (bof)
-		s = swallow_bom(s);
+		s = swallow_bom((U8*)s);
 	    incline(s);
 	} while (PL_doextract);
 	PL_oldoldbufptr = PL_oldbufptr = PL_bufptr = PL_linestart = s;
@@ -7422,9 +7396,10 @@ S_swallow_bom(pTHX_ U8 *s)
 		Perl_croak(aTHX_ "Unsupported script encoding");
 #ifndef PERL_NO_UTF16_FILTER
 	    s += 2;
-	    filter_add(S_utf16rev_textfilter, NULL);
-	    New(898, news, (PL_bufend - s) * 3 / 2 + 1, U8);
-	    PL_bufend = utf16_to_utf8((U16*)s, news, PL_bufend - s);
+	    filter_add(utf16rev_textfilter, NULL);
+	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
+	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
+					     PL_bufend - (char*)s);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
@@ -7435,9 +7410,10 @@ S_swallow_bom(pTHX_ U8 *s)
 	if (s[1] == 0xFF) {   /* UTF-16 big-endian */
 #ifndef PERL_NO_UTF16_FILTER
 	    U8 *news;
-	    filter_add(S_utf16_textfilter, NULL);
-	    New(898, news, (PL_bufend - s) * 3 / 2 + 1, U8);
-	    PL_bufend = utf16_to_utf8((U16*)s, news, PL_bufend - s);
+	    filter_add(utf16_textfilter, NULL);
+	    New(898, news, (PL_bufend - (char*)s) * 3 / 2 + 1, U8);
+	    PL_bufend = (char*)utf16_to_utf8((U16*)s, news,
+					     PL_bufend - (char*)s);
 	    s = news;
 #else
 	    Perl_croak(aTHX_ "Unsupported script encoding");
@@ -7456,7 +7432,7 @@ S_swallow_bom(pTHX_ U8 *s)
 	    Perl_croak(aTHX_ "Unsupported script encoding");
 	}
     }
-    return s;
+    return (char*)s;
 }
 
 #ifdef PERL_OBJECT
@@ -7479,3 +7455,33 @@ restore_rsfp(pTHXo_ void *f)
 	PerlIO_close(PL_rsfp);
     PL_rsfp = fp;
 }
+
+#ifndef PERL_NO_UTF16_FILTER
+static I32
+utf16_textfilter(pTHXo_ int idx, SV *sv, int maxlen)
+{
+    I32 count = FILTER_READ(idx+1, sv, maxlen);
+    if (count) {
+	U8* tmps;
+	U8* tend;
+	New(898, tmps, SvCUR(sv) * 3 / 2 + 1, U8);
+	tend = utf16_to_utf8((U16*)SvPVX(sv), tmps, SvCUR(sv));
+	sv_usepvn(sv, (char*)tmps, tend - tmps);
+    }
+    return count;
+}
+
+static I32
+utf16rev_textfilter(pTHXo_ int idx, SV *sv, int maxlen)
+{
+    I32 count = FILTER_READ(idx+1, sv, maxlen);
+    if (count) {
+	U8* tmps;
+	U8* tend;
+	New(898, tmps, SvCUR(sv) * 3 / 2 + 1, U8);
+	tend = utf16_to_utf8_reversed((U16*)SvPVX(sv), tmps, SvCUR(sv));
+	sv_usepvn(sv, (char*)tmps, tend - tmps);
+    }
+    return count;
+}
+#endif