Making fixes for Microsoft Visual C++ compiler.

[splint.git] / src / usymtab_interface.c

diff --git a/src/usymtab_interface.c b/src/usymtab_interface.c
index 2ce488d9c847d1c4f693dbb184f31b9d1a1935d8..a8ac1257a64d3f0ddbe6d8ffe0e8683ce1f6dd3e 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
@@ -32,7 +32,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "lclsyntable.h"
@@ -863,7 +863,7 @@ declareAbstractType (abstractNode n, bool priv)
   cstring tn;
   fileloc loc;
   uentry ue;
-  usymId uid;
+  typeId uid;
   abstBodyNode ab;
 
   if (n == (abstractNode) 0)
@@ -949,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;
 
@@ -982,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);
@@ -1014,8 +1012,8 @@ doDeclareType (typeNode t, bool priv)
        case TK_UNION:
        default:
          {
-           llfatalbug (message ("declareType ERROR: unknown kind: %q",
-                                cstring_fromCharsO (FormatInt ((int)t->kind))));
+           llfatalbug (message ("declareType: unknown kind: %d",
+                                (int) t->kind));
          }
        }
     }
@@ -1120,7 +1118,7 @@ declareFcnAux (fcnNode f, /*@only@*/ qtype qt, ctype ct,
        }
     }
 
-  if (usymId_isInvalid (tn))
+  if (typeId_isInvalid (tn))
     {
       acct = context_fileAccessTypes ();
     }