Re: Jarkko likes OOOOs

[p5sagit/p5-mst-13.2.git] / utf8.c

diff --git a/utf8.c b/utf8.c
index 87b9088..f16cb66 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -57,7 +57,7 @@ Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
     if (ckWARN(WARN_UTF8)) {
         if (UNICODE_IS_SURROGATE(uv) &&
             !(flags & UNICODE_ALLOW_SURROGATE))
-             Perl_warner(aTHX_ WARN_UTF8, "UTF-16 surrogate 0x%04"UVxf, uv);
+             Perl_warner(aTHX_ packWARN(WARN_UTF8), "UTF-16 surrogate 0x%04"UVxf, uv);
         else if (
                  ((uv >= 0xFDD0 && uv <= 0xFDEF &&
                    !(flags & UNICODE_ALLOW_FDD0))
@@ -72,7 +72,7 @@ Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
                  ((uv <= PERL_UNICODE_MAX) ||
                   !(flags & UNICODE_ALLOW_SUPER))
                  )
-             Perl_warner(aTHX_ WARN_UTF8,
+             Perl_warner(aTHX_ packWARN(WARN_UTF8),
                         "Unicode character 0x%04"UVxf" is illegal", uv);
     }
     if (UNI_IS_INVARIANT(uv)) {
@@ -469,10 +469,10 @@ malformed:
            char *s = SvPVX(sv);
 
            if (PL_op)
-               Perl_warner(aTHX_ WARN_UTF8,
+               Perl_warner(aTHX_ packWARN(WARN_UTF8),
                            "%s in %s", s,  OP_DESC(PL_op));
            else
-               Perl_warner(aTHX_ WARN_UTF8, "%s", s);
+               Perl_warner(aTHX_ packWARN(WARN_UTF8), "%s", s);
        }
     }
 
@@ -1751,7 +1751,7 @@ Perl_pv_uni_display(pTHX_ SV *dsv, U8 *spv, STRLEN len, STRLEN pvlim, UV flags)
                 case '\a':
                     Perl_sv_catpvf(aTHX_ dsv, "\\a"); ok = TRUE; break;
                 case '\\':
-                    Perl_sv_catpvf(aTHX_ dsv, "\\" ); ok = TRUE; break;
+                    Perl_sv_catpvf(aTHX_ dsv, "\\\\" ); ok = TRUE; break;
                 default: break;
                 }
             }