summaryrefslogtreecommitdiff
path: root/bin/ksh/expr.c
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-06-19 13:58:50 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-06-19 13:58:50 +0000
commitbf8005adcfb58b3ee760f1d617bbc31a94c84c52 (patch)
treeaa8605cd9b71bcd70c5bb79a75cbf3dc3a31643e /bin/ksh/expr.c
parentd70fd816bbcfe3ed69974e4c2a2dd94318c675c9 (diff)
back out
Diffstat (limited to 'bin/ksh/expr.c')
-rw-r--r--bin/ksh/expr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/ksh/expr.c b/bin/ksh/expr.c
index 6b9dc05b548..775d7ee44dd 100644
--- a/bin/ksh/expr.c
+++ b/bin/ksh/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.3 1997/06/18 22:42:34 kstailey Exp $ */
+/* $OpenBSD: expr.c,v 1.4 1997/06/19 13:58:41 kstailey Exp $ */
/*
* Korn expression evaluation
@@ -177,7 +177,7 @@ v_evaluate(vp, expr, error_ok)
curstate.expression = curstate.tokp = expr;
curstate.noassign = 0;
curstate.prev = es;
- curstate.evaling = NULL;
+ curstate.evaling = (struct tbl *) 0;
es = &curstate;
newenv(E_ERRH);
@@ -207,7 +207,7 @@ v_evaluate(vp, expr, error_ok)
v = intvar(evalexpr(MAX_PREC));
if (es->tok != END)
- evalerr(ET_UNEXPECTED, NULL);
+ evalerr(ET_UNEXPECTED, (char *) 0);
if (vp->flag & INTEGER)
setint_v(vp, v);
@@ -314,7 +314,7 @@ evalexpr(prec)
vl = es->val;
token();
} else {
- evalerr(ET_UNEXPECTED, NULL);
+ evalerr(ET_UNEXPECTED, (char *) 0);
/*NOTREACHED*/
}
if (es->tok == O_PLUSPLUS || es->tok == O_MINUSMINUS) {
@@ -590,7 +590,7 @@ intvar(vp)
vp->flag |= EXPRINEVAL;
v_evaluate(vq, str_val(vp), FALSE);
vp->flag &= ~EXPRINEVAL;
- es->evaling = NULL;
+ es->evaling = (struct tbl *) 0;
}
return vq;
}