summaryrefslogtreecommitdiff
path: root/op.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1999-01-01 13:53:31 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1999-01-01 13:53:31 +0000
commit68c734842396ee490e3f1243c6050bbadc602253 (patch)
tree2de972c43502c11700c0b4ccaf04eb340626e9ce /op.c
parent9b63e9ecb99b38390442c44361915d503175016f (diff)
downloadperl-68c734842396ee490e3f1243c6050bbadc602253.tar.gz
From: Hugo van der Sanden <hv@crypt.compulink.co.uk>
To: perl5-porters@perl.org cc: hv@crypt0.demon.co.uk Subject: [bug 5.004_54] duplicate error message Date: Thu, 31 Dec 1998 04:05:25 +0000 Message-Id: <199812310405.EAA00386@crypt.compulink.co.uk> Message-ID: <13963.60672.134591.383377@alias-2.pr.mcs.net> From: Stephen McCamant <smccam@uclink4.berkeley.edu> To: hv@crypt0.demon.co.uk Cc: perl5-porters@perl.org Subject: [PATCH _54] Re: duplicate error message Date: Thu, 31 Dec 1998 16:10:13 -0600 (CST) Message-Id: <199901010732.HAA02926@crypt.compulink.co.uk> From: Hugo van der Sanden <hv@crypt.compulink.co.uk> To: Stephen McCamant <smccam@uclink4.berkeley.edu> cc: hv@crypt0.demon.co.uk, perl5-porters@perl.org Subject: [TEST PATCH _54] Re: duplicate error message Date: Fri, 01 Jan 1999 07:32:14 +0000 p4raw-id: //depot/cfgperl@2548
Diffstat (limited to 'op.c')
-rw-r--r--op.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/op.c b/op.c
index 003614eaf5..58f26e160c 100644
--- a/op.c
+++ b/op.c
@@ -827,7 +827,8 @@ scalarvoid(OP *o)
SV* sv;
/* assumes no premature commitment */
- if (!o || (o->op_flags & OPf_WANT) == OPf_WANT_LIST || PL_error_count
+ U8 want = o->op_flags & OPf_WANT;
+ if (!o || (want && want != OPf_WANT_SCALAR) || PL_error_count
|| o->op_type == OP_RETURN)
return o;