pp_sys.c: Make warnings utf8-clean

1 files changed, 23 insertions, 19 deletions

diff --git a/pp_sys.c b/pp_sys.c
index 5240f8cdc8..79d6787322 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -592,8 +592,8 @@ PP(pp_open)
 
 	if (IoDIRP(io))
 	    Perl_ck_warner_d(aTHX_ packWARN2(WARN_IO, WARN_DEPRECATED),
-			     "Opening dirhandle %s also as a file",
-			     GvENAME(gv));
+			     "Opening dirhandle %"SVf" also as a file",
+			     SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
 
 	mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar);
 	if (mg) {
@@ -1347,12 +1347,10 @@ PP(pp_enterwrite)
 
     cv = GvFORM(fgv);
     if (!cv) {
-	const char *name;
 	tmpsv = sv_newmortal();
 	gv_efullname4(tmpsv, fgv, NULL, FALSE);
-	name = SvPV_nolen_const(tmpsv);
-	if (name && *name)
-	    DIE(aTHX_ "Undefined format \"%s\" called", name);
+	if (SvPOK(tmpsv) && *SvPV_nolen_const(tmpsv))
+	    DIE(aTHX_ "Undefined format \"%"SVf"\" called", SVfARG(tmpsv));
 
 	not_a_format_reference:
 	DIE(aTHX_ "Not a format reference");
@@ -1391,7 +1389,8 @@ PP(pp_leavewrite)
 		SV *topname;
 		if (!IoFMT_NAME(io))
 		    IoFMT_NAME(io) = savepv(GvNAME(gv));
-		topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%s_TOP", GvNAME(gv)));
+		topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%"SVf"_TOP",
+                                        SVfARG(sv_2mortal(newSVhek(GvNAME_HEK(gv))))));
 		topgv = gv_fetchsv(topname, 0, SVt_PVFM);
 		if ((topgv && GvFORM(topgv)) ||
 		  !gv_fetchpvs("top", GV_NOTQUAL, SVt_PVFM))
@@ -1438,11 +1437,9 @@ PP(pp_leavewrite)
 	cv = GvFORM(fgv);
 	if (!cv) {
 	    SV * const sv = sv_newmortal();
-	    const char *name;
 	    gv_efullname4(sv, fgv, NULL, FALSE);
-	    name = SvPV_nolen_const(sv);
-	    if (name && *name)
-		DIE(aTHX_ "Undefined top format \"%s\" called", name);
+	    if (SvPOK(sv) && *SvPV_nolen_const(sv))
+		DIE(aTHX_ "Undefined top format \"%"SVf"\" called", SVfARG(sv));
 	    else
 		DIE(aTHX_ "Undefined top format called");
 	}
@@ -2746,7 +2743,9 @@ PP(pp_stat)
 	    if (gv != PL_defgv) {
 	    do_fstat_warning_check:
 		Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-			       "lstat() on filehandle %s", gv ? GvENAME(gv) : "");
+			       "lstat() on filehandle %"SVf, SVfARG(gv
+                                        ? sv_2mortal(newSVhek(GvENAME_HEK(gv)))
+                                        : &PL_sv_no));
 	    } else if (PL_laststype != OP_LSTAT)
 		/* diag_listed_as: The stat preceding %s wasn't an lstat */
 		Perl_croak(aTHX_ "The stat preceding lstat() wasn't an lstat");
@@ -3787,8 +3786,8 @@ PP(pp_open_dir)
 
     if ((IoIFP(io) || IoOFP(io)))
 	Perl_ck_warner_d(aTHX_ packWARN2(WARN_IO, WARN_DEPRECATED),
-			 "Opening filehandle %s also as a directory",
-			 GvENAME(gv));
+			 "Opening filehandle %"SVf" also as a directory",
+			     SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))) );
     if (IoDIRP(io))
 	PerlDir_close(IoDIRP(io));
     if (!(IoDIRP(io) = PerlDir_open(dirname)))
@@ -3823,7 +3822,8 @@ PP(pp_readdir)
 
     if (!io || !IoDIRP(io)) {
 	Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-		       "readdir() attempted on invalid dirhandle %s", GvENAME(gv));
+		       "readdir() attempted on invalid dirhandle %"SVf,
+                            SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
         goto nope;
     }
 
@@ -3874,7 +3874,8 @@ PP(pp_telldir)
 
     if (!io || !IoDIRP(io)) {
 	Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-		       "telldir() attempted on invalid dirhandle %s", GvENAME(gv));
+		       "telldir() attempted on invalid dirhandle %"SVf,
+                            SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
         goto nope;
     }
 
@@ -3899,7 +3900,8 @@ PP(pp_seekdir)
 
     if (!io || !IoDIRP(io)) {
 	Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-		       "seekdir() attempted on invalid dirhandle %s", GvENAME(gv));
+		       "seekdir() attempted on invalid dirhandle %"SVf,
+                                SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
         goto nope;
     }
     (void)PerlDir_seek(IoDIRP(io), along);
@@ -3923,7 +3925,8 @@ PP(pp_rewinddir)
 
     if (!io || !IoDIRP(io)) {
 	Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-		       "rewinddir() attempted on invalid dirhandle %s", GvENAME(gv));
+		       "rewinddir() attempted on invalid dirhandle %"SVf,
+                                SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
 	goto nope;
     }
     (void)PerlDir_rewind(IoDIRP(io));
@@ -3946,7 +3949,8 @@ PP(pp_closedir)
 
     if (!io || !IoDIRP(io)) {
 	Perl_ck_warner(aTHX_ packWARN(WARN_IO),
-		       "closedir() attempted on invalid dirhandle %s", GvENAME(gv));
+		       "closedir() attempted on invalid dirhandle %"SVf,
+                                SVfARG(sv_2mortal(newSVhek(GvENAME_HEK(gv)))));
         goto nope;
     }
 #ifdef VOID_CLOSEDIR