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

[splint.git] / src / cstringList.c

diff --git a/src/cstringList.c b/src/cstringList.c
index e7e1593f1ebebef7a12b57277b6487789b699548..ac2ec0ea46ec477dafbd9d4d123f5cd951ecdae0 100644 (file)
--- a/src/cstringList.c
+++ b/src/cstringList.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 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
 */
 /*
 ** cstringList.c
@@ -29,7 +29,7 @@
 ** where T has T_equal (or change this) and T_unparse
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 cstringList
@@ -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)
            {
@@ -199,7 +199,7 @@ cstringList_printSpaced (cstringList s, int indent, int 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);
     }
@@ -339,3 +348,18 @@ cstringList_get (cstringList s, int index)
   llassertretnull (index < s->nelements);
   return s->elements[index];
 }
+
+ob_cstring *
+cstringList_getElements (cstringList s)
+{
+  if (cstringList_isDefined (s))
+    {
+      /*@-compmempass@*/
+      return s->elements;
+      /*@=compmempass@*/ /* This is exposed */
+    }
+  else
+    {
+      return NULL;
+    }
+}