*** empty log message ***

[splint.git] / test / metastate.expect

diff --git a/test/metastate.expect b/test/metastate.expect
index 16b1ad7ebc119af1bfaf367cf8f17f9eda0797dd..6c93c8dd876194c3ff7e736797fd89b8397d673f 100644 (file)
--- a/test/metastate.expect
+++ b/test/metastate.expect
@@ -1,13 +1,14 @@
 
 file1.c: (in function main)
 file1.c:10:14: Invalid transfer from implicitly unopen fle to open (unopen file
-                  passed as open): fle
+                  passed as open): checkOpen(..., fle, ...)
+   file1.c:6:14: fle becomes implicitly unopen
 file1.c:19:16: Invalid transfer from implicitly open fle to unopen (open file
-                  passed as unopen): fle
-   file1.c:12:3: Meta state fle becomes implicitly open
+                  passed as unopen): checkClosed(..., fle, ...)
+   file1.c:12:3: fle becomes implicitly open
 file1.c:23:14: Invalid transfer from unopen fle to open (unopen file passed as
-                  open): fle
-   file1.c:22:10: Meta state fle becomes unopen
+                  open): checkOpen(..., fle, ...)
+   file1.c:22:10: fle becomes unopen
 file1.c:7:8: Variable s declared but not used
 
 Finished LCLint checking --- 4 code errors found, as expected
@@ -28,38 +29,40 @@ file3.c:10:22: Possibly null storage fle1 passed as non-null param:
    file3.c:6:16: Storage fle1 may become null
 file3.c:11:5: Control branches merge with incompatible states for fle1 (unopen
                  and open): files merge in inconsistent state
-   file3.c:6:37: Meta state fle1 becomes implicitly open
-   file3.c:10:14: Meta state fle1 becomes unopen
+   file3.c:6:37: fle1 becomes implicitly open
+   file3.c:10:14: fle1 becomes unopen
 
 Finished LCLint checking --- 2 code errors found, as expected
 
 file4.c: (in function main)
 file4.c:15:14: Invalid transfer from implicitly unopen fle to open (unopen file
-                  passed as open): fle
+                  passed as open): checkOpen(..., fle, ...)
+   file4.c:11:14: fle becomes implicitly unopen
 
 Finished LCLint checking --- 1 code error found, as expected
 
 file5.c: (in function passOpen)
 file5.c:8:2: Ensures clause not satisfied by f (state is open):
                 ensures closed f
-   file5.c:4:35: Meta state f becomes open
+   file5.c:4:35: f becomes open
 file5.c: (in function returnOpen)
 file5.c:16:10: Result state fle does not satisfy ensures clause:
                   ensures open result (state is unopen, should be open): fle
    file5.c:13:30: Storage fle becomes dependent
 file5.c: (in function main)
 file5.c:25:14: Invalid transfer from implicitly unopen fle to open (unopen file
-                  passed as open): fle
+                  passed as open): checkOpen(..., fle, ...)
+   file5.c:21:14: fle becomes implicitly unopen
 file5.c:35:18: Invalid transfer from unopen fle to open (unopen file passed as
-                  open): fle
-   file5.c:34:3: Meta state fle becomes unopen
+                  open): fclose(..., fle, ...)
+   file5.c:34:3: fle becomes unopen
 
 Finished LCLint checking --- 4 code errors found, as expected
 
 file6.c: (in function newOpenBad)
 file6.c:20:10: Invalid transfer from unopen res to open (unopen file passed as
                   open): return res
-   file6.c:19:10: Meta state res becomes unopen
+   file6.c:19:10: res becomes unopen
 file6.c: (in function main)
 file6.c:30:12: Return loses reference fle in invalid state implicitly open
                   (open file not closed)
@@ -67,11 +70,11 @@ file6.c:30:12: Return loses reference fle in invalid state implicitly open
 
 Finished LCLint checking --- 2 code errors found, as expected
 
-filebad.c:1:23: Meta state anntation open used in inconsistent context:
+filebad.c:1:23: Attribute annotation open used in inconsistent context:
                    int badOpen(FILE *)
-filebad.c:3:52: Meta state anntation closed used in inconsistent context:
+filebad.c:3:52: Attribute annotation closed used in inconsistent context:
                    int p_x
-filebad.c:3:12: Meta state anntation open used on inappropriate reference p_x
+filebad.c:3:12: Attribute annotation open used on inappropriate reference p_x
                    in ensures open clause of badEnsures: ensures open p_x
 
 Finished LCLint checking --- 3 code errors found, as expected
@@ -92,21 +95,21 @@ sockets2.c: (in function test1)
 sockets2.c:15:4: Control branches merge with incompatible global states
     (initialized and uninitialized): Sockets initialized on true branch,
     uninitialized on false branch.
-   sockets2.c:11:24: Meta state <global marker> becomes uninitialized
-   sockets2.c:14:5: Meta state <global marker> becomes initialized
+   sockets2.c:11:24: <global marker> becomes uninitialized
+   sockets2.c:14:5: <global marker> becomes initialized
 sockets2.c: (in function test2)
 sockets2.c:24:3: Control branches merge with incompatible global states
     (uninitialized and initialized): Sockets uninitialized on false branch,
     initialized on true branch.
-   sockets2.c:20:24: Meta state <global marker> becomes initialized
-   sockets2.c:23:5: Meta state <global marker> becomes uninitialized
+   sockets2.c:20:24: <global marker> becomes initialized
+   sockets2.c:23:5: <global marker> becomes uninitialized
 
 Finished LCLint checking --- 2 code errors found, as expected
 
 struct.c: (in function source_badClose)
 struct.c:10:2: Function returns with parameter s in inconsistent state (unopen
                   is s->file, should be open): unopen file passed as open
-   struct.c:9:10: Meta state s->file becomes unopen
+   struct.c:9:10: s->file becomes unopen
 
 Finished LCLint checking --- 1 code error found, as expected