rename to be more consistent, export for teting

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22679 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-03-14 14:52:48 +00:00
parent 90c30290de
commit 00f8b507cb
4 changed files with 15 additions and 10 deletions

View File

@@ -156,7 +156,7 @@ eval_comp(hx509_context context, hx509_env env, struct hx_expr *expr)
}
int
_hx509_eval_expr(hx509_context context, hx509_env env, struct hx_expr *expr)
_hx509_expr_eval(hx509_context context, hx509_env env, struct hx_expr *expr)
{
switch (expr->op) {
case op_TRUE:
@@ -164,13 +164,13 @@ _hx509_eval_expr(hx509_context context, hx509_env env, struct hx_expr *expr)
case op_FALSE:
return 0;
case op_NOT:
return ! _hx509_eval_expr(context, env, expr->arg1);
return ! _hx509_expr_eval(context, env, expr->arg1);
case op_AND:
return _hx509_eval_expr(context, env, expr->arg1) &&
_hx509_eval_expr(context, env, expr->arg2);
return _hx509_expr_eval(context, env, expr->arg1) &&
_hx509_expr_eval(context, env, expr->arg2);
case op_OR:
return _hx509_eval_expr(context, env, expr->arg1) ||
_hx509_eval_expr(context, env, expr->arg2);
return _hx509_expr_eval(context, env, expr->arg1) ||
_hx509_expr_eval(context, env, expr->arg2);
case op_COMP:
return eval_comp(context, env, expr->arg1);
default: