shrink pp_hot fractionally

Message-ID: <20001205124431.E74518@plum.flirble.org>

Use report_evil_fh().

p4raw-id: //depot/perl@7990

4 files changed, 17 insertions, 32 deletions

diff --git a/opcode.pl b/opcode.pl
index 43d98ae8af..22ef9721ce 100755
--- a/opcode.pl
+++ b/opcode.pl
@@ -56,7 +56,9 @@ for (@ops) {
 }
 print ON "\t", &tab(3,"OP_max"), "\n";
 print ON "} opcode;\n";
-print ON "\n#define MAXO ", scalar @ops, "\n\n"; 
+print ON "\n#define MAXO ", scalar @ops, "\n";
+print ON "#define OP_phoney_INPUT_ONLY -1\n";
+print ON "#define OP_phoney_OUTPUT_ONLY -2\n\n";
 
 # Emit op names and descriptions.
 
diff --git a/opnames.h b/opnames.h
index ba28f685fc..16b2f02278 100644
--- a/opnames.h
+++ b/opnames.h
@@ -359,6 +359,8 @@ typedef enum opcode {
 } opcode;
 
 #define MAXO 351
+#define OP_phoney_INPUT_ONLY -1
+#define OP_phoney_OUTPUT_ONLY -2
 
 
 #define OP_IS_SOCKET(op)	\
diff --git a/pp_hot.c b/pp_hot.c
index c12e986665..830d56ed03 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -415,21 +415,8 @@ PP(pp_print)
     }
     else if (!(fp = IoOFP(io))) {
 	if (ckWARN2(WARN_CLOSED, WARN_IO))  {
-	    if (IoIFP(io)) {
-		/* integrate with report_evil_fh()? */
-	        char *name = NULL;
-		if (isGV(gv)) {
-		    SV* sv = sv_newmortal();
-		    gv_efullname4(sv, gv, Nullch, FALSE);
-		    name = SvPV_nolen(sv);
-		}
-		if (name && *name)
-		  Perl_warner(aTHX_ WARN_IO,
-			      "Filehandle %s opened only for input", name);
-		else
-		    Perl_warner(aTHX_ WARN_IO,
-				"Filehandle opened only for input");
-	    }
+	    if (IoIFP(io))
+		report_evil_fh(gv, io, OP_phoney_INPUT_ONLY);
 	    else if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 		report_evil_fh(gv, io, PL_op->op_type);
 	}
@@ -1394,21 +1381,7 @@ Perl_do_readline(pTHX)
 	else if (ckWARN(WARN_IO)	/* stdout/stderr or other write fh */
 		 && (IoTYPE(io) == IoTYPE_WRONLY || fp == PerlIO_stdout()
 		     || fp == PerlIO_stderr()))
-	{
-	    /* integrate with report_evil_fh()? */
-	    char *name = NULL;
-	    if (isGV(PL_last_in_gv)) { /* can this ever fail? */
-		SV* sv = sv_newmortal();
-		gv_efullname4(sv, PL_last_in_gv, Nullch, FALSE);
-		name = SvPV_nolen(sv);
-	    }
-	    if (name && *name)
-		Perl_warner(aTHX_ WARN_IO,
-			    "Filehandle %s opened only for output", name);
-	    else
-		Perl_warner(aTHX_ WARN_IO,
-			    "Filehandle opened only for output");
-	}
+	    report_evil_fh(PL_last_in_gv, io, OP_phoney_OUTPUT_ONLY);
     }
     if (!fp) {
 	if (ckWARN2(WARN_GLOB, WARN_CLOSED)
diff --git a/util.c b/util.c
index 128e24eaa3..d0ea96cbdf 100644
--- a/util.c
+++ b/util.c
@@ -3958,7 +3958,15 @@ Perl_report_evil_fh(pTHX_ GV *gv, IO *io, I32 op)
 	name = SvPVX(sv);
     }
 
-    if (name && *name) {
+    if (op == OP_phoney_OUTPUT_ONLY || op == OP_phoney_INPUT_ONLY) {
+	if (name && *name)
+	    Perl_warner(aTHX_ WARN_IO, "Filehandle %s opened only for %sput",
+			name, 
+			(op == OP_phoney_INPUT_ONLY ? "in" : "out"));
+	else
+	    Perl_warner(aTHX_ WARN_IO, "Filehandle opened only for %sput",
+			(op == OP_phoney_INPUT_ONLY ? "in" : "out"));
+    } else if (name && *name) {
 	Perl_warner(aTHX_ warn_type,
 		    "%s%s on %s %s %s", func, pars, vile, type, name);
 	if (io && IoDIRP(io) && !(IoFLAGS(io) & IOf_FAKE_DIRP))