From 17c6fe5136794b1032eab554aa2a9a16af1b5185 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Thu, 29 Jul 2004 12:47:57 +0000
Subject: [PATCH] - Fixed some more printf usages, that should now be handled
 by eprintf.

---
 src/claim.c     | 14 ++++++++------
 src/knowledge.c | 31 +++++++++++++++----------------
 src/system.c    |  2 +-
 src/termmap.c   |  6 +++---
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/claim.c b/src/claim.c
index 0932199..c000d5c 100644
--- a/src/claim.c
+++ b/src/claim.c
@@ -348,17 +348,19 @@ check_claim_nisynch (const System sys, const int i)
       cl->failed = statesIncrease (cl->failed);
 
 #ifdef DEBUG 
+      globalError++;
       warning ("Claim has failed!");
-      printf ("// To be exact, claim label ");
+      eprintf ("To be exact, claim label ");
       termPrint (cl->label);
-      printf (" with prec set ");
+      eprintf (" with prec set ");
       termlistPrint (cl->prec);
-      printf ("\n");
-      printf ("// i: %i\n// f: ",i);
+      eprintf ("\n");
+      eprintf ("i: %i\nf: ",i);
       termmapPrint (f);
-      printf ("\n// g: ");
+      eprintf ("\ng: ");
       termmapPrint (g);
-      printf ("\n");
+      eprintf ("\n");
+      globalError--;
 #endif
 
     }
diff --git a/src/knowledge.c b/src/knowledge.c
index 85d26d7..1a1410c 100644
--- a/src/knowledge.c
+++ b/src/knowledge.c
@@ -83,7 +83,7 @@ knowledgeDuplicate (Knowledge know)
 
   if (know == NULL)
     {
-      printf ("Warning! Trying to copy empty knowledge!\n");
+      warning ("Trying to copy empty knowledge.");
       return NULL;
     }
   newknow = makeKnowledge ();
@@ -141,8 +141,7 @@ knowledgeAddTerm (Knowledge know, Term term)
 {
   if (know == NULL)
     {
-      fprintf
-	(stderr, "Warning: trying to add term to uninitialised (NULL) Know pointer.\n");
+      warning ("Trying to add term to uninitialised (NULL) Know pointer.");
       return 1;
     }
   if (term == NULL)
@@ -324,20 +323,20 @@ knowledgePrint (Knowledge know)
   indent ();
   if (know == NULL)
     {
-      printf ("Empty.\n");
+      eprintf ("Empty.\n");
       return;
     }
-  printf (" [Basic]: ");
+  eprintf (" [Basic]: ");
   termlistPrint (know->basic);
-  printf ("\n");
+  eprintf ("\n");
   indent ();
-  printf (" [Encrp]: ");
+  eprintf (" [Encrp]: ");
   termlistPrint (know->encrypt);
-  printf ("\n");
+  eprintf ("\n");
   indent ();
-  printf (" [Vars]: ");
+  eprintf (" [Vars]: ");
   termlistPrint (know->vars);
-  printf ("\n");
+  eprintf ("\n");
 }
 
 //! Print the inverses list of a knowledge set.
@@ -349,14 +348,14 @@ knowledgeInversesPrint (Knowledge know)
 
   if (know == NULL)
     {
-      printf ("Empty knowledge.");
+      eprintf ("Empty knowledge.");
       return;
     }
 
   tl = knowledgeGetInverses (know);
   if (tl == NULL)
     {
-      printf ("None.");
+      eprintf ("None.");
     }
   else
     {
@@ -364,13 +363,13 @@ knowledgeInversesPrint (Knowledge know)
 	{
 	  if (after)
 	    {
-	      printf (",");
+	      eprintf (",");
 	    }
-	  printf ("(");
+	  eprintf ("(");
 	  termPrint (tl->term);
-	  printf (",");
+	  eprintf (",");
 	  termPrint (tl->next->term);
-	  printf (")");
+	  eprintf (")");
 	  after = 1;
 	  tl = tl->next->next;
 	}
diff --git a/src/system.c b/src/system.c
index 6f2faa4..1321941 100644
--- a/src/system.c
+++ b/src/system.c
@@ -165,7 +165,7 @@ systemRuns (const System sys)
 #ifdef DEBUG
   if (sys->switchScenario < 0)
     {
-      printf ("// Last run with a choose: %i\n",sys->lastChooseRun);
+      warning ("Last run with a choose: %i",sys->lastChooseRun);
     }
 #endif
 }
diff --git a/src/termmap.c b/src/termmap.c
index 73031b1..5f9ca4e 100644
--- a/src/termmap.c
+++ b/src/termmap.c
@@ -111,12 +111,12 @@ void termmapPrint (Termmap f)
 {
   if (f != NULL)
     {
-      printf ("\"");
+      eprintf ("\"");
       termPrint (f->term);
-      printf ("\" -> %i", f->result);
+      eprintf ("\" -> %i", f->result);
       if (f->next != NULL)
 	{
-	  printf (", ");
+	  eprintf (", ");
 	  termmapPrint (f->next);
 	}
     }