From: Hugo van der Sanden <hv@crypt.org>
Date: Tue, 11 Jul 2000 12:52:38 +0000 (+0100)
Subject: Precedence goof, fix based on
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6624cecc78f60f5589229cba083af18080f6e12f;p=p5sagit%2Fp5-mst-13.2.git

Precedence goof, fix based on
Subject: [PATCH 5.6.0] op/taint.t continues on failed shmget()
Message-Id: <200007111152.MAA05488@crypt.compulink.co.uk>

p4raw-id: //depot/cfgperl@6333
---

diff --git a/t/op/taint.t b/t/op/taint.t
index af57834..44f50ae 100755
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -618,8 +618,8 @@ else {
 	my $sent = "foobar";
 	my $rcvd;
 	my $size = 2000;
-	my $id = shmget(IPC_PRIVATE, $size, S_IRWXU) ||
-	    warn "# shmget failed: $!\n";
+	my $id = shmget(IPC_PRIVATE, $size, S_IRWXU);
+
 	if (defined $id) {
 	    if (shmwrite($id, $sent, 0, 60)) {
 		if (shmread($id, $rcvd, 0, 60)) {
@@ -630,7 +630,7 @@ else {
 	    } else {
 		warn "# shmwrite failed: $!\n";
 	    }
-	    shmctl($id, IPC_RMID, 0) || warn "# shmctl failed: $!\n";
+	    shmctl($id, IPC_RMID, 0) or warn "# shmctl failed: $!\n";
 	} else {
 	    warn "# shmget failed: $!\n";
 	}
@@ -666,7 +666,7 @@ else {
 	    } else {
 		warn "# msgsnd failed\n";
 	    }
-	    msgctl($id, IPC_RMID, 0) || warn "# msgctl failed: $!\n";
+	    msgctl($id, IPC_RMID, 0) or warn "# msgctl failed: $!\n";
 	} else {
 	    warn "# msgget failed\n";
 	}