From cd2ef14e4e987d4653ac51ec6931a6b974a06d03 Mon Sep 17 00:00:00 2001 From: ccremers Date: Thu, 2 Jun 2005 09:40:05 +0000 Subject: [PATCH] - [Syntactical changes only] Fixed the indentation of some files. --- src/claim.c | 2 +- src/role.c | 14 +++++++------- src/system.c | 2 +- src/timer.c | 16 +++++++++------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/claim.c b/src/claim.c index ba59acb..ab796e4 100644 --- a/src/claim.c +++ b/src/claim.c @@ -449,7 +449,7 @@ check_claim_niagree (const System sys, const int i) result = oki_nisynch (sys, i, f, g); if (!result) { -#ifdef DEBUG +#ifdef DEBUG warning ("Claim has failed!"); printf ("To be exact, claim label "); termPrint (cl->label); diff --git a/src/role.c b/src/role.c index 3548621..879e376 100644 --- a/src/role.c +++ b/src/role.c @@ -58,14 +58,14 @@ roledefPrintGeneric (Roledef rd, int print_actor) Term label; /* Old version: sometimes prints protocol stuff (really unique labels) + label = deVar (rd->label); + if (protocolCount < 2 && realTermTuple (label)) + { + // Only one protocol, so we don't need to show the extra label info + label = TermOp2 (label); + } + */ label = deVar (rd->label); - if (protocolCount < 2 && realTermTuple (label)) - { - // Only one protocol, so we don't need to show the extra label info - label = TermOp2 (label); - } - */ - label = deVar(rd->label); if (realTermTuple (label)) { label = TermOp2 (label); diff --git a/src/system.c b/src/system.c index 46d933f..b65f4e4 100644 --- a/src/system.c +++ b/src/system.c @@ -76,7 +76,7 @@ systemInit () sys->switchClaims = 0; // default don't report on claims sys->switchClaimToCheck = NULL; // default check all claims sys->switchXMLoutput = 0; // default no xml output - sys->switchHuman = false; // not human friendly by default + sys->switchHuman = false; // not human friendly by default sys->switchGoalSelectMethod = 3; // default goal selection method sys->traverse = 12; // default traversal method diff --git a/src/timer.c b/src/timer.c index 83293c7..30b5615 100644 --- a/src/timer.c +++ b/src/timer.c @@ -10,7 +10,8 @@ static clock_t endwait = 0; /** * <= 0 means none. */ -void set_time_limit (int seconds) +void +set_time_limit (int seconds) { if (seconds > 0) { @@ -25,13 +26,15 @@ void set_time_limit (int seconds) } //! Retrieve time limit -int get_time_limit () +int +get_time_limit () { return time_max_seconds; } //! Check whether time limit has passed. -int passed_time_limit () +int +passed_time_limit () { if (endwait <= 0) { @@ -41,11 +44,10 @@ int passed_time_limit () { struct tms t; - times(&t); + times (&t); if (t.tms_utime > endwait) - return 1; + return 1; else - return 0; + return 0; } } -