From a3e012c69b33927f346a33c4c7961b8043bc978c Mon Sep 17 00:00:00 2001 From: tg Date: Sun, 13 May 2007 18:49:00 +0000 Subject: [PATCH] dead code removal --- exec.c | 12 ++---------- funcs.c | 13 ++----------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/exec.c b/exec.c index 880c355..785cd47 100644 --- a/exec.c +++ b/exec.c @@ -2,7 +2,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.30 2007/05/13 17:51:21 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.31 2007/05/13 18:49:00 tg Exp $"); static int comexec(struct op *, struct tbl *volatile, const char **, int volatile); @@ -14,7 +14,6 @@ static int herein(const char *, int); static const char *do_selectargs(const char **, bool); static int dbteste_isa(Test_env *, Test_meta); static const char *dbteste_getopnd(Test_env *, Test_op, int); -static int dbteste_eval(Test_env *, Test_op, const char *, const char *, int); static void dbteste_error(Test_env *, int, const char *); /* @@ -234,7 +233,7 @@ execute(struct op *volatile t, te.pos.wp = t->args; te.isa = dbteste_isa; te.getopnd = dbteste_getopnd; - te.eval = dbteste_eval; + te.eval = test_eval; te.error = dbteste_error; rv = test_parse(&te); @@ -1448,13 +1447,6 @@ dbteste_getopnd(Test_env *te, Test_op op, int do_eval) return s; } -static int -dbteste_eval(Test_env *te, Test_op op, const char *opnd1, const char *opnd2, - int do_eval) -{ - return test_eval(te, op, opnd1, opnd2, do_eval); -} - static void dbteste_error(Test_env *te, int offset, const char *msg) { diff --git a/funcs.c b/funcs.c index 6e0a59b..08e965d 100644 --- a/funcs.c +++ b/funcs.c @@ -5,7 +5,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.52 2007/05/13 18:33:28 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.53 2007/05/13 18:49:00 tg Exp $"); int c_cd(const char **wp) @@ -2413,8 +2413,6 @@ static int test_nexpr(Test_env *, int); static int test_primary(Test_env *, int); static int ptest_isa(Test_env *, Test_meta); static const char *ptest_getopnd(Test_env *, Test_op, int); -static int ptest_eval(Test_env *, Test_op, const char *, - const char *, int); static void ptest_error(Test_env *, int, const char *); int @@ -2427,7 +2425,7 @@ c_test(const char **wp) te.flags = 0; te.isa = ptest_isa; te.getopnd = ptest_getopnd; - te.eval = ptest_eval; + te.eval = test_eval; te.error = ptest_error; for (argc = 0; wp[argc]; argc++) @@ -2827,13 +2825,6 @@ ptest_getopnd(Test_env *te, Test_op op, int do_eval __unused) return *te->pos.wp++; } -static int -ptest_eval(Test_env *te, Test_op op, const char *opnd1, const char *opnd2, - int do_eval) -{ - return test_eval(te, op, opnd1, opnd2, do_eval); -} - static void ptest_error(Test_env *te, int offset, const char *msg) {