Changed checking of complete descruction so +strictdestroy is no

[splint.git] / src / context.c

diff --git a/src/context.c b/src/context.c
index 23c66e1c3a5c25e3873b6bc30df4af0b13c1819e..7c1e48072e852b3091bc34c883ad0fefba733789 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -1035,7 +1035,9 @@ context_setMode (cstring s)
          FLG_EXPORTLOCAL,
 
          FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE,
-         FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, 
+         FLG_MUSTFREEONLY, 
+         FLG_MUSTFREEFRESH,
+         FLG_MUSTDEFINE, FLG_GLOBSTATE, 
          FLG_COMPDESTROY, FLG_MUSTNOTALIAS,
          FLG_MEMIMPLICIT,
          FLG_BRANCHSTATE, 
@@ -1157,7 +1159,9 @@ context_setMode (cstring s)
          FLG_IMMEDIATETRANS,
          FLG_ONLYUNQGLOBALTRANS,
          FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE,
-         FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, 
+         FLG_MUSTFREEONLY,
+         FLG_MUSTFREEFRESH,
+         FLG_MUSTDEFINE, FLG_GLOBSTATE, 
          FLG_COMPDESTROY, FLG_MUSTNOTALIAS,
          FLG_MEMIMPLICIT,
          FLG_BRANCHSTATE, 
@@ -1267,7 +1271,9 @@ context_setMode (cstring s)
          FLG_UNKNOWNINITTRANS,
 
          FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE,
-         FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, 
+         FLG_MUSTFREEONLY,
+         FLG_MUSTFREEFRESH,
+         FLG_MUSTDEFINE, FLG_GLOBSTATE, 
          FLG_COMPDESTROY, FLG_MUSTNOTALIAS,
          FLG_MEMIMPLICIT,
          FLG_BRANCHSTATE, 
@@ -3984,6 +3990,10 @@ context_setFlagAux (flagcode f, bool b, bool inFile,
       DOSET (FLG_NULLPASS, b);
       DOSET (FLG_NULLRET, b);
       break;
+    case FLG_MUSTFREE:
+      DOSET (FLG_MUSTFREEONLY, b);
+      DOSET (FLG_MUSTFREEFRESH, b);
+      break;
     case FLG_MEMCHECKS:
       DOSET (FLG_NULLSTATE, b);
       DOSET (FLG_NULLDEREF, b);
@@ -3997,7 +4007,8 @@ context_setFlagAux (flagcode f, bool b, bool inFile,
       DOSET (FLG_USERELEASED, b);
       DOSET (FLG_ALIASUNIQUE, b);
       DOSET (FLG_MAYALIASUNIQUE, b);
-      DOSET (FLG_MUSTFREE, b);
+      DOSET (FLG_MUSTFREEONLY, b);
+      DOSET (FLG_MUSTFREEFRESH, b);
       DOSET (FLG_MUSTDEFINE, b);
       DOSET (FLG_GLOBSTATE, b); 
       DOSET (FLG_COMPDESTROY, b);