- library fixes:

[splint.git] / src / llmain.c

diff --git a/src/llmain.c b/src/llmain.c
index 2a5d46c762f1fc04a6addb21a7d1ade9b0dc3715..5d4c546404ccdb12c410af7ecd8d38d97642a385 100644 (file)
--- a/src/llmain.c
+++ b/src/llmain.c
@@ -79,7 +79,12 @@
 
 extern /*@external@*/ int yydebug;
 static void cleanupFiles (void);
-static void interrupt (int p_i);
+/*
+** evans 2002-07-03: renamed from interrupt to avoid conflict with WATCOM compiler keyword
+**    (Suggested by Adam Clarke)
+*/
+
+static void llinterrupt (int p_i);
 
 static void describeVars (void);
 static bool specialFlagsHelp (char *p_next);
@@ -406,8 +411,8 @@ int main (int argc, char *argv[])
   g_messagestream = stderr;
   g_errorstream = stderr;
 
-  (void) signal (SIGINT, interrupt);
-  (void) signal (SIGSEGV, interrupt); 
+  (void) signal (SIGINT, llinterrupt);
+  (void) signal (SIGSEGV, llinterrupt); 
 
   flags_initMod ();
   clabstract_initMod ();
@@ -1119,24 +1124,24 @@ int main (int argc, char *argv[])
          
          if (anylcl)
            {
-             sprintf (msg, 
-                      "Time distribution (percent): initialize %.2f / lcl %.2f / "
-                      "pre-process %.2f / c check %.2f / finalize %.2f \n", 
-                      (100.0 * (double) (libtime - before) / ttime),
-                      (100.0 * (double) (lcltime - libtime) / ttime),
-                      (100.0 * (double) (pptime - lcltime) / ttime),
-                      (100.0 * (double) (cptime - pptime) / ttime),
-                      (100.0 * (double) (rstime - cptime) / ttime));
+             (void) snprintf (msg, 256,
+                       "Time distribution (percent): initialize %.2f / lcl %.2f / "
+                       "pre-process %.2f / c check %.2f / finalize %.2f \n", 
+                       (100.0 * (double) (libtime - before) / ttime),
+                       (100.0 * (double) (lcltime - libtime) / ttime),
+                       (100.0 * (double) (pptime - lcltime) / ttime),
+                       (100.0 * (double) (cptime - pptime) / ttime),
+                       (100.0 * (double) (rstime - cptime) / ttime));
            }
          else
            {
-             sprintf (msg, 
-                      "Time distribution (percent): initialize %.2f / "
-                      "pre-process %.2f / c check %.2f / finalize %.2f \n", 
-                      (100.0 * (double) (libtime - before) / ttime),
-                      (100.0 * (double) (pptime - libtime) / ttime),
-                      (100.0 * (double) (cptime - pptime) / ttime),
-                      (100.0 * (double) (rstime - cptime) / ttime));
+             (void) snprintf (msg, 256,
+                       "Time distribution (percent): initialize %.2f / "
+                       "pre-process %.2f / c check %.2f / finalize %.2f \n", 
+                       (100.0 * (double) (libtime - before) / ttime),
+                       (100.0 * (double) (pptime - libtime) / ttime),
+                       (100.0 * (double) (cptime - pptime) / ttime),
+                       (100.0 * (double) (rstime - cptime) / ttime));
            }
          
          llgenindentmsgnoloc (cstring_fromCharsO (msg));
@@ -1155,7 +1160,7 @@ int main (int argc, char *argv[])
 # endif 
 
 void
-interrupt (int i)
+llinterrupt (int i)
 {
   switch (i)
     {
@@ -1306,10 +1311,10 @@ static fileIdList preprocessFiles (fileIdList fl, bool xhfiles)
              if ((filesprocessed % skip) == 0) 
                {
                  if (filesprocessed == 0) {
-                   displayScan (cstring_makeLiteral (" "));
+                   displayScanContinue (cstring_makeLiteral (" "));
                  }
                  else {
-                   displayScan (cstring_makeLiteral ("."));
+                   displayScanContinue (cstring_makeLiteral ("."));
                  }
                }
              filesprocessed++;