Fixed but with multiple globals clauses reported by Gayath Ratnayaka.

[splint.git] / src / cstringList.c

diff --git a/src/cstringList.c b/src/cstringList.c
index 1a71e71a5732f3c6a05050cc4aef292f71a7bc03..bdd2e5746750ae55f9979568d4af416f717e32ac 100644 (file)
--- a/src/cstringList.c
+++ b/src/cstringList.c
@@ -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
 */
 /*
@@ -174,7 +174,7 @@ cstringList_unparseSep (cstringList s, cstring sep)
 }
 
 void
-cstringList_printSpaced (cstringList s, int indent, int gap, int linelen)
+cstringList_printSpaced (cstringList s, size_t indent, size_t gap, int linelen)
 {
   if (cstringList_isDefined (s))
     {
@@ -182,7 +182,7 @@ cstringList_printSpaced (cstringList s, int indent, int gap, int linelen)
       cstring istring = cstring_fill (cstring_undefined, indent);
       cstring gstring = cstring_fill (cstring_undefined, gap);
       int numcol;
-      int longest = 0;
+      size_t longest = 0;
       int i;
  
       /*
@@ -191,7 +191,7 @@ cstringList_printSpaced (cstringList s, int indent, int gap, int linelen)
 
       for (i = 0; i < s->nelements; i++)
        {
-         int len = cstring_length (s->elements[i]);
+         size_t len = cstring_length (s->elements[i]);
 
          if (len > longest)
            {
@@ -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);
     }
@@ -339,3 +348,16 @@ cstringList_get (cstringList s, int index)
   llassertretnull (index < s->nelements);
   return s->elements[index];
 }
+
+ob_mstring *
+cstringList_getElements (cstringList s)
+{
+  if (cstringList_isDefined (s))
+    {
+      /*@i423@*/ return s->elements;
+    }
+  else
+    {
+      return NULL;
+    }
+}