Made allocations involving sizeof work correctly (test/malloc.c).

[splint.git] / src / Headers / context.h

diff --git a/src/Headers/context.h b/src/Headers/context.h
index fbc1ace6dcb6534991f930f454e7339cc2409888..c8ba6c3c66b679982ad7db2331363a6f3bad16f2 100644 (file)
--- a/src/Headers/context.h
+++ b/src/Headers/context.h
@@ -58,6 +58,8 @@ extern /*@observer@*/ cstring context_getTrueName (void) /*@*/ ;
 extern /*@observer@*/ cstring context_getLarchPath (void) /*@*/ ;
 extern /*@observer@*/ cstring context_getLCLImportDir (void) /*@*/ ;
 
+extern constraintList context_getImplicitFcnConstraints (uentry p_ue) /*@*/ ;
+
 extern bool context_checkExport (uentry p_e) /*@*/ ;
 extern bool context_checkGlobMod (sRef p_el) /*@*/ ;
 extern bool context_checkGlobUse (uentry p_glob);
@@ -331,36 +333,24 @@ extern void context_addAnnotation (/*@only@*/ annotationInfo)
 extern void context_addMetaState (/*@only@*/ cstring, /*@only@*/ metaStateInfo)
      /*@modifies internalState@*/ ;
 
-extern valueTable context_createValueTable (sRef p_s, /*@only@*/ stateInfo p_sinfo)
+extern valueTable context_createValueTable (sRef p_s, /*@only@*/ stateInfo p_info)
      /*@globals internalState@*/ ;
 
-extern valueTable context_createGlobalMarkerValueTable (/*@only@*/ stateInfo p_sinfo)
+extern valueTable context_createGlobalMarkerValueTable (/*@only@*/ stateInfo p_info)
      /*@globals internalState@*/ ;
 
 extern int context_getBugsLimit (void) /*@*/ ;
 # define context_getBugsLimit()  ((int)context_getValue(FLG_BUGSLIMIT))
 
-/*drl 12/30/2001 these are some ugly functions that were added to facilitate struct annotations */
-/*drl 1/6/2001: I didn't think these functions were solid enough to include in the
-  stable  release of splint.  I commented them out so that they won't break anything
-  but didn't delete them because they will be fixed and included later
-*/
-
-/*extern void  setGlobalStructInfo(ctype p_ct, constraintList p_list); */
-
-/*extern constraintList getInvariants (ctype p_ct); */
-
-/* static int getSref (ctype ct, sRef s); */
-
-/* sRef fixSref (ctype p_ct, sRef p_base, sRef p_fix); */
-
-extern ctype context_setLastStruct (/*@returned@*/ ctype p_s) /*@modifies internalState@*/;
-extern ctype context_getLastStruct (/*@returned@*/ /*ctype p_s*/) /*@modifies internalState@*/;
-
 /*drl added 2/4/2002*/
 
 extern bool context_inOldStyleScope (void) /*@*/ ;
-extern void context_setGlobalStructInfo (ctype p_ct, constraintList p_list) /*@modifies internalState@*/ ;
+
+/*drl added 3/5/2003*/
+
+extern bool context_inSizeof (void);
+extern void context_enterSizeof (void);
+extern void context_leaveSizeof (void);
 
 # else
 # error "Multiple include"