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

[splint.git] / src / cstringList.c

diff --git a/src/cstringList.c b/src/cstringList.c
index 7cced01f444c8db21dd7b2d95301780a42399595..ac2ec0ea46ec477dafbd9d4d123f5cd951ecdae0 100644 (file)
--- a/src/cstringList.c
+++ b/src/cstringList.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2000 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
@@ -50,6 +50,18 @@ cstringList_newEmpty (void)
   return (s);
 }
 
+static /*@notnull@*/ cstringList
+cstringList_newPredict (int size)
+{
+  cstringList s = (cstringList) dmalloc (sizeof (*s));
+  
+  s->nelements = 0;
+  s->nspace = size; 
+  s->elements = (cstring *) dmalloc (sizeof (*s->elements) * size);
+
+  return (s);
+}
+
 static void
 cstringList_grow (/*@notnull@*/ cstringList s)
 {
@@ -57,10 +69,10 @@ cstringList_grow (/*@notnull@*/ cstringList s)
   cstring *newelements;
   
   s->nspace += cstringListBASESIZE;
-
+  
   newelements = (cstring *) dmalloc (sizeof (*newelements) 
                                     * (s->nelements + s->nspace));
-
+  
 
   if (newelements == (cstring *) 0)
     {
@@ -102,6 +114,36 @@ cstringList cstringList_add (cstringList s, /*@keep@*/ cstring el)
   return s;
 }
 
+cstringList cstringList_prepend (cstringList s, /*@keep@*/ cstring el)
+{
+  int i;
+
+  DPRINTF (("Prepend:  %s + %s",
+           cstringList_unparse (s), cstring_toCharsSafe (el)));
+
+  if (!cstringList_isDefined (s))
+    {
+      return cstringList_single (el);
+    }
+
+  if (s->nspace <= 0)
+    {
+      cstringList_grow (s);
+    }
+  
+  s->nspace--;
+
+  for (i = s->nelements; i > 0; i--) 
+    {
+      s->elements[i] = s->elements [i - 1];
+    }
+
+  s->elements[0] = el;
+  s->nelements++;
+
+  return s;
+}
+
 cstring
 cstringList_unparse (cstringList s)
 {
@@ -132,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))
     {
@@ -140,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;
  
       /*
@@ -149,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)
            {
@@ -157,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) 
        {
@@ -224,6 +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);
     }
@@ -241,3 +294,72 @@ cstringList_alphabetize (cstringList s)
     }
 }
 
+int cstringList_getIndex (cstringList s, cstring key)
+{
+  int index = 0;
+
+  cstringList_elements (s, el) 
+    {
+      if (cstring_equal (el, key))
+       {
+         return index;
+       }
+
+      index++;
+    } end_cstringList_elements ;
+
+  BADBRANCHRET (0);
+}
+
+bool cstringList_contains (cstringList s, cstring key)
+{
+  int index = 0;
+
+  cstringList_elements (s, el) 
+    {
+      if (cstring_equal (el, key))
+       {
+         return TRUE;
+       }
+
+      index++;
+    } end_cstringList_elements ;
+
+  return FALSE;
+}
+
+cstringList cstringList_copy (cstringList s)
+{
+  cstringList res = cstringList_newPredict (cstringList_size (s));
+
+  cstringList_elements (s, el)
+    {
+      res = cstringList_add (res, cstring_copy (el));
+    } end_cstringList_elements ;
+
+  return res;
+}
+
+cstring
+cstringList_get (cstringList s, int index)
+{
+  llassertretnull (s != NULL);
+  llassertretnull (index >= 0);
+  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;
+    }
+}