Fixed line numbering when multi-line macro parameters are used.

[splint.git] / src / fileTable.c

diff --git a/src/fileTable.c b/src/fileTable.c
index 079783472a21faa065952a4c72b2db2b79f9a2b5..7869f87567ac7e130761c784ae59e8f38882d6f0 100644 (file)
--- a/src/fileTable.c
+++ b/src/fileTable.c
@@ -99,6 +99,8 @@ static cstring ftentry_unparse (fileTable ft, ftentry fte)
 {
   if (fileId_isValid (fte->fder))
     {
+      llassert (fileTable_isDefined (ft));
+
       return message ("%s %q %d (%s)", 
                      fte->fname, 
                      fileType_unparse (fte->ftype),
@@ -1015,13 +1017,19 @@ void fileTable_closeAll (fileTable ft)
 {
   int i = 0;
 
+  llassert (fileTable_isDefined (ft));
+
   for (i = 0; i < ft->nopen; i++) 
     {
       /* 
         lldiagmsg (message ("Unclosed file at exit: %s", ft->openelements[i]->fname)); 
       */
+      
+      if (ft->openelements[i]->f != NULL)
+       {
+         (void) fclose (ft->openelements[i]->f); /* No check - cleaning up after errors */
+       }
 
-      (void) fclose (ft->openelements[i]->f); /* No check - cleaning up after errors */
       ft->openelements[i]->f = NULL;
       foentry_free (ft->openelements[i]);
       ft->openelements[i] = NULL;