/*
** 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
** 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
*/
/*
}
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))
{
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;
/*
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)
{
}
}
- numcol = (linelen - indent) / (longest + gap);
+ numcol = size_toInt ((linelen - indent) / (longest + gap));
if (numcol <= 1)
{
{
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);
}
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;
+ }
+}