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

Reindent code for consistency.

Browse Source
This commit is contained in:
Cas Cremers 2018-10-15 09:40:07 -04:00
parent 369ae1e3f8
commit 0d9c23c33b
8 changed files with 62 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dotout.c
View File

@ -726,7 +726,9 @@ isApplicationM0 (const System sys, const int run)
* Name & documentation might be off; TODO later. * Name & documentation might be off; TODO later.
* This is for now just a refactoring to get rid of trampolines. * This is for now just a refactoring to get rid of trampolines.
*/ */
int preceventPossible (const System sys, const int rank, const int run, const int rank2, const int run2, const int ev2) int
preceventPossible (const System sys, const int rank, const int run,
const int rank2, const int run2, const int ev2)
{ {
// regular preceding event // regular preceding event
@ -738,8 +740,7 @@ int preceventPossible (const System sys, const int rank, const int run, const in
if (rank2 == rank) if (rank2 == rank)
{ {
// equal rank: only if different run // equal rank: only if different run
if ((sys->runs[run].protocol != INTRUDER) if ((sys->runs[run].protocol != INTRUDER) && (run2 == run))
&& (run2 == run))
{ {
return false; return false;
} }
@ -753,7 +754,8 @@ int preceventPossible (const System sys, const int rank, const int run, const in
* This is for now just a refactoring to get rid of trampolines. * This is for now just a refactoring to get rid of trampolines.
*/ */
int int
iteratePrecedingRole(const System sys, const int *ranks, const int run, const int ev, const int rank) iteratePrecedingRole (const System sys, const int *ranks, const int run,
const int ev, const int rank)
{ {
int run2; int run2;

3
src/switches.c
View File

@ -1703,7 +1703,8 @@ process_switches (int commandline)
{ {
printf ("Try '%s --help' for more information, or visit:\n", printf ("Try '%s --help' for more information, or visit:\n",
progname); progname);
printf (" http://www.cs.ox.ac.uk/people/cas.cremers/scyther/index.html\n"); printf
(" http://www.cs.ox.ac.uk/people/cas.cremers/scyther/index.html\n");
exit (0); exit (0);
} }
else else

6
src/xmlout.c
View File

@ -539,13 +539,15 @@ isEventInteresting (const System sys, const Roledef rd)
} }
//! Refactoring code from below //! Refactoring code from below
void xmlRunIndex (char *desc, const int run, const int index) void
xmlRunIndex (char *desc, const int run, const int index)
{ {
xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index); xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index);
} }
//! Refactoring code from below //! Refactoring code from below
void xmlShowThisBinding(const Binding b) void
xmlShowThisBinding (const Binding b)
{ {
if (isTermVariable (b->term) && !b->done) if (isTermVariable (b->term) && !b->done)
{ {