From 10732ae6d35d2f1917805485cf7d763a1e982faa Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Mon, 24 Dec 2018 15:55:38 +0100 Subject: [PATCH] Removed another fake nested function. --- src/dotout.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/dotout.c b/src/dotout.c index b7e0ad7..1f9cd76 100644 --- a/src/dotout.c +++ b/src/dotout.c @@ -1674,6 +1674,16 @@ struct state_dss Termlist found; }; +int +addsubterms (Term t, struct state_dss *sdss) +{ + if (isIntruderChoice (t)) + { + sdss->found = termlistAddNew (sdss->found, t); + } + return true; +} + //! Display the current semistate using dot output format. /** * This is not as nice as we would like it. Furthermore, the function is too big. @@ -1780,7 +1790,6 @@ dotSemiState (const System mysys) * Stupid brute analysis, can probably be done much more efficient, but * this is not a timing critical bit, so we just do it like this. */ - Termlist found; List bl; struct state_dss Sdss; @@ -1793,15 +1802,6 @@ dotSemiState (const System mysys) b = (Binding) bl->data; if (!b->blocked) { - int addsubterms (Term t, struct state_dss *sdss) - { - if (isIntruderChoice (t)) - { - sdss->found = termlistAddNew (sdss->found, t); - } - return true; - } - term_iterate_state_open_leaves (b->term, addsubterms, &Sdss); } } @@ -1812,7 +1812,7 @@ dotSemiState (const System mysys) eprintf ("\tintruder [\n"); eprintf ("\t\tlabel=\""); eprintf ("Initial intruder knowledge"); - if (found != NULL) + if (Sdss.found != NULL) { eprintf ("\\n"); eprintf ("The intruder generates: ");