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

[splint.git] / src / rcfiles.c

diff --git a/src/rcfiles.c b/src/rcfiles.c
index b234c4455c669078589fd0decbae557f92368eac..2bc9a1e06dfffe6c468f25f86c4351b19299fdf8 100644 (file)
--- a/src/rcfiles.c
+++ b/src/rcfiles.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
@@ -30,11 +30,11 @@
 # include "rcfiles.h"
 
 
-static void rcfiles_loadFile (FILE *p_rcfile, cstringSList *p_passThroughArgs)
+static void rcfiles_loadFile (FILE *p_rcfile, cstringList *p_passThroughArgs)
    /*@modifies *p_passThroughArgs, p_rcfile@*/
    /*@ensures closed p_rcfile@*/ ;
 
-bool rcfiles_read (cstring fname, cstringSList *passThroughArgs, bool report)
+bool rcfiles_read (cstring fname, cstringList *passThroughArgs, bool report)
 {
   bool res = FALSE;
 
@@ -57,7 +57,7 @@ bool rcfiles_read (cstring fname, cstringSList *passThroughArgs, bool report)
          fileloc fc = g_currentloc;
          g_currentloc = fileloc_createRc (fname);
 
-         displayScan (message ("< reading options from %q >", 
+         displayScan (message ("reading options from %q", 
                                fileloc_outputFilename (g_currentloc)));
          
          rcfiles_loadFile (innerf, passThroughArgs);
@@ -80,7 +80,7 @@ bool rcfiles_read (cstring fname, cstringSList *passThroughArgs, bool report)
   return res;
 }
 
-static void rcfiles_loadFile (/*:open:*/ FILE *rcfile, cstringSList *passThroughArgs)
+static void rcfiles_loadFile (/*:open:*/ FILE *rcfile, cstringList *passThroughArgs)
    /*@modifies rcfile@*/
    /*@ensures closed rcfile@*/
 {
@@ -89,7 +89,7 @@ static void rcfiles_loadFile (/*:open:*/ FILE *rcfile, cstringSList *passThrough
   cstringList args = cstringList_new ();
 
   DPRINTF (("Loading rc file..."));
-
+  
   s = os;
 
   while (reader_readLine (rcfile, s, MAX_LINE_LENGTH) != NULL)
@@ -173,7 +173,7 @@ static void rcfiles_loadFile (/*:open:*/ FILE *rcfile, cstringSList *passThrough
            }
          
          *s = c;
-         DPRINTF (("Pass through: %s", cstringSList_unparse (*passThroughArgs)));
+         DPRINTF (("Pass through: %s", cstringList_unparse (*passThroughArgs)));
          
          while ((c == ' ') || (c == '\t'))
            {
@@ -195,7 +195,10 @@ static void rcfiles_loadFile (/*:open:*/ FILE *rcfile, cstringSList *passThrough
                      fileIdList_undefined,
                      passThroughArgs,
                      cstringList_size (args),
-                     cstringList_getElements (args));
+                     /*@-nullstate@*/ /*@-type@*/ /* exposes cstring type */ 
+                     cstringList_getElements (args)
+                     /*@=nullstate@*/ /*@=type@*/
+                     );
   cstringList_free (args);
   check (fileTable_closeFile (context_fileTable (), rcfile));
 }