X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/28bf4b0bfd405a2057d865910f8589c54a40f17b..a9ec328054b628447830161535f4915f715f49cd:/src/Headers/usymtab-branch.h

diff --git a/src/Headers/usymtab-branch.h b/src/Headers/usymtab-branch.h
index 2eae7a3..574ea80 100644
--- a/src/Headers/usymtab-branch.h
+++ b/src/Headers/usymtab-branch.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 */
 /*
@@ -63,7 +63,7 @@ struct _usymtab
 
 extern void usymtab_printTypes (void) 
   /*@globals internalState@*/
-  /*@modifies g_msgstream@*/ ;
+  /*@modifies g_warningstream@*/ ;
 
 extern void usymtab_setMustBreak (void) /*@modifies internalState@*/ ;
 
@@ -72,15 +72,15 @@ extern bool usymtab_inFunctionScope (void) /*@globals internalState@*/ ;
 extern bool usymtab_inFileScope (void) /*@globals internalState@*/ ;
 extern void usymtab_checkFinalScope (bool p_isReturn) 
   /*@globals internalState@*/ 
-  /*@modifies *g_msgstream@*/ ;
+  /*@modifies *g_warningstream@*/ ;
 
 extern void usymtab_allUsed (void)
    /*@globals internalState@*/ 
-   /*@modifies *g_msgstream@*/ ;
+   /*@modifies *g_warningstream@*/ ;
 
 extern void usymtab_allDefined (void)
    /*@globals internalState@*/
-   /*@modifies *g_msgstream@*/ ;
+   /*@modifies *g_warningstream@*/ ;
 
 extern void usymtab_prepareDump (void)
    /*@modifies internalState@*/ ;
@@ -124,20 +124,16 @@ extern /*@observer@*/ uentry usymtab_lookupStructTag (cstring p_k)
 extern /*@observer@*/ uentry usymtab_lookupEither (cstring p_k)
    /*@globals internalState@*/ ;
 
-# ifndef NOLCL
 extern ctype usymtab_lookupType (cstring p_k)
    /*@globals internalState@*/ ;
-# endif
 
 extern bool usymtab_isDefinitelyNull (sRef p_s)
    /*@globals internalState@*/ ;
 extern bool usymtab_isDefinitelyNullDeep (sRef p_s)
    /*@globals internalState@*/ ;
 
-# ifndef NOLCL
 extern usymId usymtab_supExposedTypeEntry (/*@only@*/ uentry p_e, bool p_dodef)
    /*@modifies internalState, p_e@*/ ;
-# endif
 
 extern ctype usymtab_supTypeEntry (/*@only@*/ uentry p_e)
    /*@modifies internalState, p_e@*/ ;
@@ -154,10 +150,8 @@ extern /*@observer@*/ uentry usymtab_getGlobalEntry (usymId p_uid)
 extern bool usymtab_exists (cstring p_k)
    /*@globals internalState@*/ ;
 
-# ifndef NOLCL
 extern bool usymtab_existsVar (cstring p_k)
    /*@globals internalState@*/ ;
-# endif
 
 extern bool usymtab_existsGlob (cstring p_k)
    /*@globals internalState@*/ ;
@@ -165,10 +159,8 @@ extern bool usymtab_existsGlob (cstring p_k)
 extern bool usymtab_existsType (cstring p_k)
    /*@globals internalState@*/ ;
 
-# ifndef NOLCL
 extern bool usymtab_existsEither (cstring p_k)
    /*@globals internalState@*/ ;
-# endif
 
 extern bool usymtab_existsTypeEither (cstring p_k)
    /*@globals internalState@*/ ;
@@ -179,10 +171,8 @@ extern usymId usymtab_getTypeId (cstring p_k) /*@globals internalState@*/ ;
 extern void usymtab_supEntry (/*@only@*/ uentry p_e)
   /*@modifies internalState, p_e@*/ ;
 
-# ifndef NOLCL
 extern void usymtab_replaceEntry (/*@only@*/ uentry p_s)
   /*@modifies internalState, p_s@*/ ;
-# endif
 
 extern void usymtab_supEntrySref (/*@only@*/ uentry p_e)
   /*@modifies internalState, p_e@*/ ;
@@ -245,15 +235,15 @@ extern typeId typeId_fromInt (int p_i);
 
 extern /*@unused@*/ void usymtab_displayAllUses (void)
    /*@globals internalState@*/ 
-   /*@modifies *g_msgstream@*/ ;
+   /*@modifies *g_warningstream@*/ ;
 
 extern /*@unused@*/ void usymtab_printOut (void)
    /*@globals internalState@*/ 
-   /*@modifies *g_msgstream@*/ ;
+   /*@modifies *g_warningstream@*/ ;
 
 extern /*@unused@*/ void usymtab_printAll (void)
    /*@globals internalState@*/ 
-   /*@modifies *g_msgstream@*/ ;
+   /*@modifies *g_warningstream@*/ ;
 
 extern void usymtab_enterScope (void) 
   /*@modifies internalState;@*/ ;
@@ -314,13 +304,11 @@ extern void
 
 extern void usymtab_unguard (sRef p_s) /*@modifies internalState@*/ ;
 extern bool usymtab_isGuarded (sRef p_s) /*@globals internalState@*/ ;
-extern void usymtab_printGuards (void) /*@globals internalState@*/ /*@modifies *g_msgstream@*/ ;
+extern void usymtab_printGuards (void) /*@globals internalState@*/ /*@modifies *g_warningstream@*/ ;
 extern void usymtab_quietPlainExitScope (void) /*@modifies internalState@*/ ;
 extern void usymtab_printComplete (void) /*@globals internalState@*/ /*@modifies *stdout@*/ ;
 
-# ifndef NOLCL
 extern bool usymtab_existsGlobEither (cstring p_k) /*@globals internalState@*/ ;
-# endif
 
 extern bool usymtab_isBoolType (usymId p_uid) /*@globals internalState@*/ ;
 extern /*@only@*/ cstring 
@@ -414,7 +402,7 @@ extern void usymtab_popCaseBranch (void)
 /*@constant int functionScope;@*/
 # define functionScope 3
 
-extern /*@falsenull@*/ bool usymtab_isDefined (usymtab p_u) /*@*/ ;
+extern /*@falsewhennull@*/ bool usymtab_isDefined (usymtab p_u) /*@*/ ;
 
 /*@constant null usymtab usymtab_undefined; @*/
 # define usymtab_undefined ((usymtab)NULL)
@@ -422,7 +410,7 @@ extern /*@falsenull@*/ bool usymtab_isDefined (usymtab p_u) /*@*/ ;
 
 extern void usymtab_checkDistinctName (uentry p_e, int p_scope)
   /*@globals internalState@*/
-  /*@modifies *g_msgstream, p_e@*/ ;
+  /*@modifies *g_warningstream, p_e@*/ ;
 
 extern /*@exposed@*/ sRef usymtab_lookupGlobalMarker (void) /*@globals internalState@*/ ;