partly fix perldiag regressions identified by Tom Christiansen

p4raw-id: //depot/perl@4709

4 files changed, 38 insertions, 36 deletions

diff --git a/t/pragma/warn/4lint b/t/pragma/warn/4lint
index b7c64c31ac..db54f31c7b 100644
--- a/t/pragma/warn/4lint
+++ b/t/pragma/warn/4lint
@@ -9,14 +9,14 @@ $a = 1 if $a EQ $b ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
 Use of EQ is deprecated at - line 5.
-print on closed filehandle main::STDIN at - line 6.
+print() on closed filehandle main::STDIN at - line 6.
 ########
 -W
 # lint: check runtime $^W is zapped
 $^W = 0 ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
-print on closed filehandle main::STDIN at - line 4.
+print() on closed filehandle main::STDIN at - line 4.
 ########
 -W
 # lint: check runtime $^W is zapped
@@ -25,7 +25,7 @@ print on closed filehandle main::STDIN at - line 4.
   close STDIN ; print STDIN "abc" ;
 }
 EXPECT
-print on closed filehandle main::STDIN at - line 5.
+print() on closed filehandle main::STDIN at - line 5.
 ########
 -W
 # lint: check "no warnings" is zapped
@@ -35,7 +35,7 @@ $a = 1 if $a EQ $b ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
 Use of EQ is deprecated at - line 5.
-print on closed filehandle main::STDIN at - line 6.
+print() on closed filehandle main::STDIN at - line 6.
 ########
 -W
 # lint: check "no warnings" is zapped
@@ -44,7 +44,7 @@ print on closed filehandle main::STDIN at - line 6.
   close STDIN ; print STDIN "abc" ;
 }
 EXPECT
-print on closed filehandle main::STDIN at - line 5.
+print() on closed filehandle main::STDIN at - line 5.
 ########
 -Ww
 # lint: check combination of -w and -W
@@ -53,7 +53,7 @@ print on closed filehandle main::STDIN at - line 5.
   close STDIN ; print STDIN "abc" ;
 }
 EXPECT
-print on closed filehandle main::STDIN at - line 5.
+print() on closed filehandle main::STDIN at - line 5.
 ########
 -W
 --FILE-- abc.pm
diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio
index 4706aebfdc..57dd993a2b 100644
--- a/t/pragma/warn/doio
+++ b/t/pragma/warn/doio
@@ -1,6 +1,6 @@
   doio.c	
 
-  Can't do bidirectional pipe		[Perl_do_open9]
+  Can't open bidirectional pipe		[Perl_do_open9]
     open(F, "| true |");
 
   Missing command in piped open		[Perl_do_open9]
@@ -64,7 +64,7 @@ no warnings 'io' ;
 open(G, '|'.($^O eq 'VMS' ? 'mcr ':'')."$^X -e 1|");
 close(G);
 EXPECT
-Can't do bidirectional pipe at - line 3.
+Can't open bidirectional pipe at - line 3.
 ########
 # doio.c [Perl_do_open9]
 use warnings 'io' ;
diff --git a/t/pragma/warn/pp_hot b/t/pragma/warn/pp_hot
index 379918b6b8..7e19dc5c94 100644
--- a/t/pragma/warn/pp_hot
+++ b/t/pragma/warn/pp_hot
@@ -9,7 +9,7 @@
   Filehandle %s opened only for output		[pp_print]
     print <STDOUT> ;
 
-  print on closed filehandle %s			[pp_print]
+  print() on closed filehandle %s		[pp_print]
     close STDIN ; print STDIN "abc" ;
 
   uninitialized					[pp_rv2av]
@@ -30,7 +30,7 @@
 
   glob failed (can't start child: %s)		[Perl_do_readline] <<TODO
 
-  Read on closed filehandle %s			[Perl_do_readline]
+  readline() on closed filehandle %s		[Perl_do_readline]
     close STDIN ; $a = <STDIN>;
 
   glob failed (child exited with status %d%s)	[Perl_do_readline] <<TODO
@@ -86,7 +86,7 @@ print STDIN "anc";
 no warnings 'closed' ;
 print STDIN "anc";
 EXPECT
-print on closed filehandle main::STDIN at - line 4.
+print() on closed filehandle main::STDIN at - line 4.
 ########
 # pp_hot.c [pp_rv2av]
 use warnings 'uninitialized' ;
@@ -128,7 +128,7 @@ close STDIN ; $a = <STDIN> ;
 no warnings 'closed' ;
 $a = <STDIN> ;
 EXPECT
-Read on closed filehandle main::STDIN at - line 3.
+readline() on closed filehandle main::STDIN at - line 3.
 ########
 # pp_hot.c [Perl_do_readline]
 use warnings 'io' ;
diff --git a/t/pragma/warn/pp_sys b/t/pragma/warn/pp_sys
index 651cdf9515..ea4b536842 100644
--- a/t/pragma/warn/pp_sys
+++ b/t/pragma/warn/pp_sys
@@ -8,7 +8,7 @@
     .
     write STDIN;
 
-  Write on closed filehandle %s			[pp_leavewrite]
+  write() on closed filehandle %s		[pp_leavewrite]
     format STDIN =
     .
     close STDIN;
@@ -23,45 +23,47 @@
     $a = "abc"; 
     printf $a "fred"
 
-  printf on closed filehandle %s		[pp_prtf]
+  printf() on closed filehandle %s		[pp_prtf]
     close STDIN ;
     printf STDIN "fred"
 
-  Syswrite on closed filehandle			[pp_send]
+  syswrite() on closed filehandle		[pp_send]
     close STDIN; 
     syswrite STDIN, "fred", 1;
 
-  Send on closed socket				[pp_send]
+  send() on closed socket			[pp_send]
     close STDIN; 
     send STDIN, "fred", 1
 
-  bind() on closed fd				[pp_bind]
+  bind() on closed socket			[pp_bind]
     close STDIN; 
     bind STDIN, "fred" ;
 
 
-  connect() on closed fd			[pp_connect]
+  connect() on closed socket			[pp_connect]
     close STDIN; 
     connect STDIN, "fred" ;
 
-  listen() on closed fd				[pp_listen]
+  listen() on closed socket			[pp_listen]
     close STDIN; 
     listen STDIN, 2;
 
-  accept() on closed fd				[pp_accept]
+  accept() on closed socket			[pp_accept]
     close STDIN; 
     accept STDIN, "fred" ;
 
-  shutdown() on closed fd			[pp_shutdown]
+  shutdown() on closed socket			[pp_shutdown]
     close STDIN; 
     shutdown STDIN, 0;
 
-  [gs]etsockopt() on closed fd			[pp_ssockopt]
+  setsockopt() on closed socket			[pp_ssockopt]
+  getsockopt() on closed socket			[pp_ssockopt]
     close STDIN; 
     setsockopt STDIN, 1,2,3;
     getsockopt STDIN, 1,2;
 
-  get{sock, peer}name() on closed fd		[pp_getpeername]
+  getsockname() on closed socket		[pp_getpeername]
+  getpeername() on closed socket		[pp_getpeername]
     close STDIN; 
     getsockname STDIN;
     getpeername STDIN;
@@ -112,7 +114,7 @@ write STDIN;
 no warnings 'closed' ;
 write STDIN;
 EXPECT
-Write on closed filehandle main::STDIN at - line 6.
+write() on closed filehandle main::STDIN at - line 6.
 ########
 # pp_sys.c [pp_leavewrite]
 use warnings 'io' ;
@@ -148,7 +150,7 @@ printf STDIN "fred";
 no warnings 'closed' ;
 printf STDIN "fred";
 EXPECT
-printf on closed filehandle main::STDIN at - line 4.
+printf() on closed filehandle main::STDIN at - line 4.
 ########
 # pp_sys.c [pp_prtf]
 use warnings 'io' ;
@@ -165,7 +167,7 @@ syswrite STDIN, "fred", 1;
 no warnings 'closed' ;
 syswrite STDIN, "fred", 1;
 EXPECT
-Syswrite on closed filehandle at - line 4.
+syswrite() on closed filehandle at - line 4.
 ########
 # pp_sys.c [pp_prtf pp_send pp_bind pp_connect pp_listen pp_accept pp_shutdown pp_ssockopt ppp_getpeername]
 use warnings 'io' ;
@@ -210,16 +212,16 @@ getsockopt STDIN, 1,2;
 getsockname STDIN;
 getpeername STDIN;
 EXPECT
-Send on closed socket at - line 22.
-bind() on closed fd at - line 23.
-connect() on closed fd at - line 24.
-listen() on closed fd at - line 25.
-accept() on closed fd at - line 26.
-shutdown() on closed fd at - line 27.
-[gs]etsockopt() on closed fd at - line 28.
-[gs]etsockopt() on closed fd at - line 29.
-get{sock, peer}name() on closed fd at - line 30.
-get{sock, peer}name() on closed fd at - line 31.
+send() on closed socket at - line 22.
+bind() on closed socket at - line 23.
+connect() on closed socket at - line 24.
+listen() on closed socket at - line 25.
+accept() on closed socket at - line 26.
+shutdown() on closed socket at - line 27.
+setsockopt() on closed socket at - line 28.
+getsockopt() on closed socket at - line 29.
+getsockname() on closed socket at - line 30.
+getpeername() on closed socket at - line 31.
 ########
 # pp_sys.c [pp_stat]
 use warnings 'newline' ;