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

[splint.git] / src / usymtab_interface.c

diff --git a/src/usymtab_interface.c b/src/usymtab_interface.c
index c3af74c54f9c9ef4e741cc3f96c1309fa9619143..f55a38822d0076d184c285c7e93da17d7df28584 100644 (file)
--- a/src/usymtab_interface.c
+++ b/src/usymtab_interface.c
@@ -1,6 +1,6 @@
 /*
 ** 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
@@ -17,8 +17,8 @@
 ** 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 information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
@@ -31,8 +31,8 @@
 **
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "lclsyntable.h"
@@ -271,7 +271,8 @@ static ctype
                
                usymtab_supEntry 
                  (uentry_makeDatatype 
-                  (tn, ctype_unknown, MAYBE, NO, fileloc_getBuiltin ()));
+                  (tn, ctype_unknown, MAYBE, qual_createConcrete (), 
+                   fileloc_getBuiltin ()));
                
              }
            /*@switchbreak@*/ break;
@@ -553,7 +554,7 @@ static /*@only@*/ qtype
       
       result = qtype_addQualList (result, n->quals);
 
-      if (n->pointers > 0)
+      if (pointers_isDefined (n->pointers))
        {
          qtype_adjustPointers (n->pointers, result);
        }
@@ -586,11 +587,11 @@ static /*@only@*/ multiVal
   
   if /*@-usedef@*/ (first == '\"') /*@=usedef@*/
     {
-      int len = cstring_length (text) - 2;
+      size_t len = cstring_length (text) - 2;
       char *val = mstring_create (len);
       
       llassert (cstring_lastChar (text) == '\"');
-      strncpy (val, cstring_toCharsSafe (text) + 1, size_fromInt (len));
+      strncpy (val, cstring_toCharsSafe (text) + 1, len);
       return (multiVal_makeString (cstring_fromCharsO (val)));
     }
 
@@ -862,7 +863,7 @@ declareAbstractType (abstractNode n, bool priv)
   cstring tn;
   fileloc loc;
   uentry ue;
-  usymId uid;
+  typeId uid;
   abstBodyNode ab;
 
   if (n == (abstractNode) 0)
@@ -876,7 +877,9 @@ declareAbstractType (abstractNode n, bool priv)
   loc = fileloc_fromTok (n->tok);
   
   ue = uentry_makeDatatypeAux (tn, ctype_unknown, 
-                              ynm_fromBool (n->isMutable), YES, loc, priv);
+                              ynm_fromBool (n->isMutable), 
+                              qual_createAbstract (), 
+                              loc, priv);
 
   if (n->isRefCounted)
     {
@@ -946,10 +949,8 @@ declareAbstractType (abstractNode n, bool priv)
     }
 }
 
-static void
-  declareExposedType (exposedNode n, bool priv)
+static void declareExposedType (exposedNode n, bool priv)
 {
-  usymId uid;
   qtype c;
   cstring s;
 
@@ -969,7 +970,8 @@ static void
 
     s = getVarName (i->declarator->type);
 
-    ue = uentry_makeDatatypeAux (s, realType, MAYBE, NO, loc, priv);
+    ue = uentry_makeDatatypeAux (s, realType, MAYBE, qual_createConcrete (), 
+                                loc, priv);
 
     uentry_reflectQualifiers (ue, qtype_getQuals (c));
     
@@ -978,7 +980,7 @@ static void
        uentry_setDefined (ue, loc);
       }
 
-    uid = usymtab_supExposedTypeEntry (ue, context_inLCLLib () && !priv);
+    (void) usymtab_supExposedTypeEntry (ue, context_inLCLLib () && !priv);
   } end_declaratorInvNodeList_elements;
 
   qtype_free (c);
@@ -1116,7 +1118,7 @@ declareFcnAux (fcnNode f, /*@only@*/ qtype qt, ctype ct,
        }
     }
 
-  if (usymId_isInvalid (tn))
+  if (typeId_isInvalid (tn))
     {
       acct = context_fileAccessTypes ();
     }