X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/86d93ed383c14be2a4548bd8ab98e4c1a79cb1f0..0f55522abf3e990fe6984a24a351bf684c4977cc:/src/macrocache.c

diff --git a/src/macrocache.c b/src/macrocache.c
index 87aaea3..6a59b64 100644
--- a/src/macrocache.c
+++ b/src/macrocache.c
@@ -17,8 +17,8 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on splint: splint@cs.virginia.edu
-** To report a bug: splint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
@@ -179,7 +179,7 @@ macrocache_addEntry (macrocache s, /*@only@*/ fileloc fl, /*@only@*/ cstring def
 void
 macrocache_addComment (macrocache s, /*@only@*/ fileloc fl, /*@only@*/ cstring def)
 {
-  DPRINTF (("Add comment: %s / %s", fileloc_unparse (fl), def));
+  DPRINTF (("Macrocache add comment: %s / %s", fileloc_unparse (fl), def));
   macrocache_addGenEntry (s, fl, def, TRUE);
 }
 
@@ -236,7 +236,7 @@ static void pushString (/*@only@*/ cstring s)
       cstring fname;
       mtid = fileTable_addMacrosFile (context_fileTable ());
       
-      fname = fileName (mtid);
+      fname = fileTable_fileName (mtid);
       s_macFile = fileTable_openFile (context_fileTable (), fname, "wb+");
       
       if (s_macFile == NULL)
@@ -353,13 +353,10 @@ extern void macrocache_processUndefinedElements (macrocache m)
 		}
 	      else
 		{
-		  if (context_getFlag (FLG_SHOWSCAN))
+		  if (!fileloc_isLib (fl))
 		    {
-		      if (!fileloc_isLib (fl))
-			{
-			  lldiagmsg (message ("< checking macros %q >",
-					      fileloc_outputFilename (fl)));
-			}
+		      displayScan (message ("checking macros %q",
+					    fileloc_outputFilename (fl)));
 		    }
 		  
 		  lastfl = fl;