Fixed all /*@i...@*/ tags (except 1).

[splint.git] / src / lclinit.c

diff --git a/src/lclinit.c b/src/lclinit.c
index 1efb405412770e34150d09211612684f3aa5a2e8..94b590a443ea1d789f5621388719e0a7e8e8e83d 100644 (file)
--- a/src/lclinit.c
+++ b/src/lclinit.c
@@ -1,6 +1,6 @@
 /*
 ** 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
@@ -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
 */
 /*
@@ -28,7 +28,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "scanline.h"
@@ -107,7 +107,7 @@ static void ProcessSynonym (void) /*@modifies nextToken@*/ ;
 
 static void
   LocalUserError (/*@unused@*/ ltoken p_t, /*@temp@*/ char *p_msg)
-  /*@modifies *g_msgstream@*/ ;
+  /*@modifies *g_warningstream@*/ ;
 
 /* If TRUE character has been redefined as a singleChar. */
 static bool defineSingleChar[LASTCHAR + 1];
@@ -153,7 +153,7 @@ hasFirstChar (ltoken tok) /*@*/
 }
 
 void
-LCLProcessInitFile (void)
+lclinit_process (void)
 {
   InitLines ();
 
@@ -171,8 +171,6 @@ InitLines (void)
   setCodePoint ();
   InitReduce (INITLINES1);
 
-  
-
   if (ltoken_getCode (nextToken) != LEOFTOKEN)
     {
       InitLine ();
@@ -189,15 +187,14 @@ InitLines (void)
 static void
 InitLine (void)
 {
-  
   if (ltoken_getCode (nextToken) == LLT_EOL)
     {
       /* Nothing on line. */
-            InitReduce (INITLINE1);
+      InitReduce (INITLINE1);
     }
   else
     {
-            Classification ();
+      Classification ();
       InitReduce (INITLINE2);
     }
 
@@ -205,15 +202,14 @@ InitLine (void)
     {
       LocalUserError (nextToken, "Unexpected tokens on line");
     }
-
+  
   nextToken = LCLScanNextToken (); /* Discard EOL      */
-  }
+}
 
 static void
 Classification (void)
 {
   lsymbol ntext = ltoken_getRawText (nextToken);  
-
     
   if (ntext == ltoken_getText (endCommentCharToken)
       || ntext == ltoken_getText (idCharToken)
@@ -251,7 +247,7 @@ Classification (void)
     {
       llbug (message ("Expected character, token, or synonym classification: %s",
                      ltoken_getRawString (nextToken)));
-     /* pop off all tokens on this line */
+      /* pop off all tokens on this line */
     }
 }
 
@@ -259,9 +255,7 @@ static void
 CharClass (void)
 {
   ltoken charClassToken;
-
   charClassToken = nextToken;
-
   nextToken = LCLScanNextToken ();             /* Discard char class keyword. */
 
   if (ltoken_getRawText (charClassToken) == ltoken_getText (endCommentCharToken))
@@ -451,7 +445,7 @@ static void WhiteChar (void) /*@modifies nextToken@*/
 }
 
 static void
-  TokenClass (void) /*@modifies nextToken@*/
+TokenClass (void) /*@modifies nextToken@*/
 {
   ltoken tokenClassToken;
   lsymbol ttext = ltoken_getRawText (nextToken);
@@ -1471,7 +1465,7 @@ static void
  */
 
 void
-LCLProcessInitFileInit (void)
+lclinit_initMod (void)
 {
   int i;
 
@@ -1536,14 +1530,15 @@ LCLProcessInitFileInit (void)
 }
 
 void
-LCLProcessInitFileReset (void)
+lclinit_reset (void)
 {
   nextToken = LCLScanNextToken ();       
 }
 
 void
-LCLProcessInitFileCleanup (void)
+lclinit_cleanup (void)
 {
+  ;
 }