andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed another fake nested function.

Browse Source
This commit is contained in:
Cas Cremers 2018-12-24 15:55:38 +01:00
parent 733b8eba57
commit 10732ae6d3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dotout.c
View File

@ -1674,6 +1674,16 @@ struct state_dss
Termlist found; 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. //! Display the current semistate using dot output format.
/** /**
* This is not as nice as we would like it. Furthermore, the function is too big. * 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 * 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. * this is not a timing critical bit, so we just do it like this.
*/ */
Termlist found;
List bl; List bl;
struct state_dss Sdss; struct state_dss Sdss;
@ -1793,15 +1802,6 @@ dotSemiState (const System mysys)
b = (Binding) bl->data; b = (Binding) bl->data;
if (!b->blocked) 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); term_iterate_state_open_leaves (b->term, addsubterms, &Sdss);
} }
} }
@ -1812,7 +1812,7 @@ dotSemiState (const System mysys)
eprintf ("\tintruder [\n"); eprintf ("\tintruder [\n");
eprintf ("\t\tlabel=\""); eprintf ("\t\tlabel=\"");
eprintf ("Initial intruder knowledge"); eprintf ("Initial intruder knowledge");
if (found != NULL) if (Sdss.found != NULL)
{ {
eprintf ("\\n"); eprintf ("\\n");
eprintf ("The intruder generates: "); eprintf ("The intruder generates: ");