X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/80489f0ab878fa01f87a35988aedff282e5f0ea5..5b99bfd6792ab9229bb5b1d9048833d21b22ecef:/src/cttable.i

diff --git a/src/cttable.i b/src/cttable.i
index 18a30eb..7613cb6 100644
--- a/src/cttable.i
+++ b/src/cttable.i
@@ -1,6 +1,6 @@
 /* ;-*-C-*-; 
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -320,7 +320,7 @@ cttable_dump (FILE *fout)
   if (context_getFlag (FLG_SHOWSCAN) && cttab.size > 5000)
     {
       displayScanClose ();
-      displayScanOpen (message ("< Dumping type table (%d types) ", cttab.size));
+      displayScanOpen (message ("Dumping type table (%d types)", cttab.size));
       showdotstride = cttab.size / 5;
       showdots = TRUE;
     }
@@ -338,14 +338,15 @@ cttable_dump (FILE *fout)
       if (showdots && (i != 0 && ((i - 1) % showdotstride == 0)))
 	{
 	  (void) fflush (g_warningstream);
-	  fprintf (stderr, ".");
+	  displayScanContinue (cstring_makeLiteralTemp ("."));
 	  (void) fflush (stderr);
 	}
     }
 
   if (showdots)
     {
-      fprintf (stderr, " >\n< Continuing dump ");
+      displayScanClose ();
+      displayScanOpen (cstring_makeLiteral ("Continuing dump "));
     }
   
 }
@@ -359,6 +360,7 @@ static void cttable_load (FILE *f)
   /*@modifies cttab, f @*/
 {
   char *s = mstring_create (MAX_DUMP_LINE_LENGTH);
+  char *os = s;
   ctentry cte;
 
   cttable_reset ();
@@ -382,7 +384,7 @@ static void cttable_load (FILE *f)
     {
       ctype ct;
 
-  /*drl bee: tcf*/      cte = ctentry_undump (s);
+      /*drl bee: tcf*/      cte = ctentry_undump (s);
       ct = cttable_addFull (cte);
 
       DPRINTF (("Type: %d: %s", ct, ctype_unparse (ct)));
@@ -393,10 +395,10 @@ static void cttable_load (FILE *f)
 	  ctype_recordConj (ct);
 	}
 
-      (void) reader_readLine (f, s, MAX_DUMP_LINE_LENGTH);
+      s = reader_readLine (f, s, MAX_DUMP_LINE_LENGTH);
     }
 
-  sfree (s);
+  sfree (os);
 
   /*
   DPRINTF (("Done loading cttable: "));
@@ -539,7 +541,7 @@ cttable_addComplex (/*@only@*/ ctbase cnew)
 	  
 	  ctb = ctype_getCtbase (i);
 	  
-	  /*@i32 is this optimization really worthwhile??? */
+	  /* is this optimization really worthwhile? */
 
 	  if (ctbase_isDefined (ctb) && ctbase_equivStrict (cnew, ctb))
 	    {