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

[splint.git] / src / lclscanline.c

diff --git a/src/lclscanline.c b/src/lclscanline.c
index 0500b50ef1b2930c2e4fa3417d5fc88a72f5f259..59bbd8f3e6643e2e216a9a08b81301f01e55ddd0 100644 (file)
--- a/src/lclscanline.c
+++ b/src/lclscanline.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2000 University of Virginia,
+** Splint - annotation-assisted static program checker
+** 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,9 +17,9 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
-** For more information: http://lclint.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
 */
 /*
 ** scanline.c
@@ -49,8 +49,8 @@
 */
 
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "scanline.h"
@@ -122,8 +122,8 @@ static charClassData LCLcharClass[LASTCHAR + 1];
 
 /* evs - sounds bogus to me! */
 
-static unsigned int colNumber; 
-static unsigned int startCol;  
+static int colNumber;  
+static int startCol;   
 static char *currentLine;      
 static char currentChar;       
 static ltokenCode tokenCode;   
@@ -775,11 +775,11 @@ ScanCString (void)
            }
          else if (currentChar == '\n')
            {
-             LocalUserError ("unterminated C string");
+             LocalUserError ("Unterminated C string");
            }
          else
            {
-             LocalUserError ("invalid character in C string");
+             LocalUserError ("Invalid character in C string");
            }
        }
       LCLMOVECHAR ();          /* discard closing quote */
@@ -822,11 +822,11 @@ ScanCChar (void)
            }
          else if (currentChar == '\n')
            {
-             LocalUserError ("unterminated C character constant");
+             LocalUserError ("Unterminated C character constant");
            }
          else
            {
-             LocalUserError ("invalid character in C character");
+             LocalUserError ("Invalid character in C character");
            }
        }
       LCLMOVECHAR ();          /* discard closing quote */
@@ -834,7 +834,7 @@ ScanCChar (void)
     }
   else
     {
-      LocalUserError ("invalid C character");
+      LocalUserError ("Invalid C character");
     }
 
 
@@ -1609,8 +1609,8 @@ LCLScanLine (char *line)
        }
 
       ltoken_setCol (newToken, startCol);
-      ltoken_setLine (newToken, tsource_thisLineNumber (LCLScanSource ()));
-      ltoken_setFileName (newToken, tsource_fileName (LCLScanSource ()));
+      ltoken_setLine (newToken, inputStream_thisLineNumber (LCLScanSource ()));
+      ltoken_setFileName (newToken, inputStream_fileName (LCLScanSource ()));
 
       if (ltoken_getCode (newToken) == commentSym)
        {
@@ -1694,8 +1694,8 @@ LCLScanEofToken (void)
     }
 
   ltoken_setCol (t, colNumber);
-  ltoken_setLine (t, tsource_thisLineNumber (LCLScanSource ()));
-  ltoken_setFileName (t, tsource_fileName (LCLScanSource ()));
+  ltoken_setLine (t, inputStream_thisLineNumber (LCLScanSource ()));
+  ltoken_setFileName (t, inputStream_fileName (LCLScanSource ()));
 
   return t;
 }
@@ -1709,10 +1709,10 @@ LCLReportEolTokens (bool setting)
 static void
 LocalUserError (char *msg)
 {
-  tsource *s = LCLScanSource ();
-  llfatalerror (message ("%s:%u,%u: %s", 
-                        cstring_fromChars (tsource_fileName (s)), 
-                        tsource_thisLineNumber (s),
+  inputStream s = LCLScanSource ();
+  llfatalerror (message ("%s:%d,%d: %s", 
+                        inputStream_fileName (s), 
+                        inputStream_thisLineNumber (s),
                         colNumber,
                         cstring_fromChars (msg)));
 }