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

[splint.git] / src / cstringList.c

diff --git a/src/cstringList.c b/src/cstringList.c
index 479b4be394a75d95086290de5e62eebe45bc9621..ac2ec0ea46ec477dafbd9d4d123f5cd951ecdae0 100644 (file)
--- a/src/cstringList.c
+++ b/src/cstringList.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
@@ -199,7 +199,7 @@ cstringList_printSpaced (cstringList s, size_t indent, size_t gap, int linelen)
            }
        }
 
-      numcol = (linelen - indent) / (longest + gap);
+      numcol = size_toInt ((linelen - indent) / (longest + gap));
       
       if (numcol <= 1) 
        {
@@ -266,8 +266,17 @@ cstringList_free (cstringList s)
 {
   if (cstringList_isDefined (s))
     {
+      int i;
+
       DPRINTF (("cstringList free: [%p] %s",
                s, cstringList_unparse (s)));
+
+      /* evans 2002-07-12: this was missing, not detected because of reldef */
+      for (i = 0; i < s->nelements; i++)
+       {
+         cstring_free (s->elements[i]);
+       }
+
       sfree (s->elements);
       sfree (s);
     }
@@ -340,12 +349,14 @@ cstringList_get (cstringList s, int index)
   return s->elements[index];
 }
 
-ob_mstring *
+ob_cstring *
 cstringList_getElements (cstringList s)
 {
   if (cstringList_isDefined (s))
     {
-      /*@i423@*/ return s->elements;
+      /*@-compmempass@*/
+      return s->elements;
+      /*@=compmempass@*/ /* This is exposed */
     }
   else
     {