Removed .lh .lcs .lcd files in test directory from distribution tar ball as suggested...

[splint.git] / src / abstract.c

diff --git a/src/abstract.c b/src/abstract.c
index 7f55b8d593bf6fb51b4ab56de7eabdf7b4388a4a..301a81f67a33cce9472170ba69da218746ec4093 100644 (file)
--- a/src/abstract.c
+++ b/src/abstract.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
 */
 /*
@@ -1078,7 +1078,7 @@ importNode_makeBracketed (/*@only@*/ ltoken t)
 
 static cstring extractQuote (/*@only@*/ cstring s)
 {
-  int len = cstring_length (s);
+  size_t len = cstring_length (s);
   char *sc = cstring_toCharsSafe (s);
   cstring t;
 
@@ -1674,7 +1674,7 @@ makeLclTypeSpecNodeConj (/*@null@*/ lclTypeSpecNode a, /*@null@*/ lclTypeSpecNod
   lclTypeSpecNode n = (lclTypeSpecNode) dmalloc (sizeof (*n));
 
   n->kind = LTS_CONJ;
-  n->pointers = 0;
+  n->pointers = pointers_undefined;
   n->quals = qualList_new ();
   n->content.conj = (lclconj) dmalloc (sizeof (*n->content.conj));
   n->content.conj->a = a;
@@ -1689,7 +1689,7 @@ makeLclTypeSpecNodeType (/*@null@*/ CTypesNode x)
   lclTypeSpecNode n = (lclTypeSpecNode) dmalloc (sizeof (*n));
 
   n->kind = LTS_TYPE;
-  n->pointers = 0;
+  n->pointers = pointers_undefined;
   n->content.type = x;
   n->quals = qualList_new ();
   return (n);
@@ -1701,7 +1701,7 @@ makeLclTypeSpecNodeSU (/*@null@*/ strOrUnionNode x)
   lclTypeSpecNode n = (lclTypeSpecNode) dmalloc (sizeof (*n));
 
   n->kind = LTS_STRUCTUNION;
-  n->pointers = 0;
+  n->pointers = pointers_undefined;
   n->content.structorunion = x;
   n->quals = qualList_new ();
   return (n);
@@ -1714,7 +1714,7 @@ makeLclTypeSpecNodeEnum (/*@null@*/ enumSpecNode x)
 
   n->quals = qualList_new ();
   n->kind = LTS_ENUM;
-  n->pointers = 0;
+  n->pointers = pointers_undefined;
   n->content.enumspec = x;
   return (n);
 }
@@ -3235,7 +3235,7 @@ paramNode_checkQualifiers (lclTypeSpecNode t, typeExpr d)
 
   llassert (lclTypeSpecNode_isDefined (t));
 
-  if (t->pointers == 0 
+  if (pointers_isUndefined (t->pointers)
       && (d != (typeExpr)0 && d->kind != TEXPR_PTR) && d->kind != TEXPR_ARRAY)
     {
       if (t->kind == LTS_TYPE)
@@ -3413,23 +3413,23 @@ lclTypeSpecNode_unparseAltComments (/*@null@*/ lclTypeSpecNode typespec) /*@*/
                    return (message ("%q%s", s, ltoken_unparse (n->opttagid)));
                  }
 
-               s = message ("%q%s {\n\2\1", s, ltoken_unparse (n->opttagid));
+               s = message ("%q%s {\n\t", s, ltoken_unparse (n->opttagid));
              }
            else
              {
-               s = message ("%q{\n\2\1", s);
+               s = message ("%q{\n\t", s);
              }
 
            decls = n->structdecls;
 
            stDeclNodeList_elements (decls, f)
            {
-             s = message ("%q%q\1%q;\n\1", s, 
+             s = message ("%q%q %q;\n\t", s, 
                           lclTypeSpecNode_unparseAltComments (f->lcltypespec),
                          declaratorNodeList_unparse (f->declarators));
            } end_stDeclNodeList_elements;
 
-           return (message ("%q\3}", s));
+           return (message ("%q }", s));
          }
        case LTS_CONJ:
          {
@@ -3520,23 +3520,23 @@ cstring lclTypeSpecNode_unparseComments (/*@null@*/ lclTypeSpecNode typespec)
                    return (message ("%q%s", s, ltoken_unparse (n->opttagid)));
                  }
 
-               s = message ("%q%s {\n\2\1", s, ltoken_unparse (n->opttagid));
+               s = message ("%q%s {\n\t", s, ltoken_unparse (n->opttagid));
              }
            else
              {
-               s = message ("%q{\n\2\1", s);
+               s = message ("%q{\n\t", s);
              }
 
            decls = n->structdecls;
 
            stDeclNodeList_elements (decls, f)
            {
-             s = message ("%q%q\1%q;\n\1", s, 
+             s = message ("%q%q %q;\n\t", s, 
                           lclTypeSpecNode_unparseComments (f->lcltypespec),
                          declaratorNodeList_unparse (f->declarators));
            } end_stDeclNodeList_elements;
 
-           return (message ("%q\3}", s));
+           return (message ("%q }", s));
          }
        case LTS_CONJ:
          {
@@ -5179,12 +5179,10 @@ lclTypeSpecNode2sort (lclTypeSpecNode type)
          return sort_makePtrN (type->content.type->sort, type->pointers);
        case LTS_STRUCTUNION:
          llassert (type->content.structorunion != NULL);
-         return sort_makePtrN (type->content.structorunion->sort,
-                               type->pointers);
+         return sort_makePtrN (type->content.structorunion->sort, type->pointers);
        case LTS_ENUM:
          llassert (type->content.enumspec != NULL);
-         return sort_makePtrN (type->content.enumspec->sort, 
-                               type->pointers);
+         return sort_makePtrN (type->content.enumspec->sort, type->pointers);
        case LTS_CONJ:
          return (lclTypeSpecNode2sort (type->content.conj->a));
        }