C++: Actually fix expected files after layout changes.

Author: geoffw0

cpp/ql/test/query-tests/Security/CWE/CWE-190/SAMATE/ArithmeticTainted.expected

@@ -1,13 +1,13 @@
 edges
-| examples.cpp:62:26:62:30 | & ... | examples.cpp:65:11:65:14 | data |
-| examples.cpp:62:26:62:30 | & ... | examples.cpp:65:11:65:14 | data |
-| examples.cpp:62:26:62:30 | fscanf output argument | examples.cpp:65:11:65:14 | data |
-| examples.cpp:62:26:62:30 | fscanf output argument | examples.cpp:65:11:65:14 | data |
+| examples.cpp:63:26:63:30 | & ... | examples.cpp:66:11:66:14 | data |
+| examples.cpp:63:26:63:30 | & ... | examples.cpp:66:11:66:14 | data |
+| examples.cpp:63:26:63:30 | fscanf output argument | examples.cpp:66:11:66:14 | data |
+| examples.cpp:63:26:63:30 | fscanf output argument | examples.cpp:66:11:66:14 | data |
 nodes
-| examples.cpp:62:26:62:30 | & ... | semmle.label | & ... |
-| examples.cpp:62:26:62:30 | fscanf output argument | semmle.label | fscanf output argument |
-| examples.cpp:65:11:65:14 | data | semmle.label | data |
-| examples.cpp:65:11:65:14 | data | semmle.label | data |
-| examples.cpp:65:11:65:14 | data | semmle.label | data |
+| examples.cpp:63:26:63:30 | & ... | semmle.label | & ... |
+| examples.cpp:63:26:63:30 | fscanf output argument | semmle.label | fscanf output argument |
+| examples.cpp:66:11:66:14 | data | semmle.label | data |
+| examples.cpp:66:11:66:14 | data | semmle.label | data |
+| examples.cpp:66:11:66:14 | data | semmle.label | data |
 #select
-| examples.cpp:65:11:65:14 | data | examples.cpp:62:26:62:30 | & ... | examples.cpp:65:11:65:14 | data | $@ flows to here and is used in arithmetic, potentially causing an underflow. | examples.cpp:62:26:62:30 | & ... | User-provided value |
+| examples.cpp:66:11:66:14 | data | examples.cpp:63:26:63:30 | & ... | examples.cpp:66:11:66:14 | data | $@ flows to here and is used in arithmetic, potentially causing an underflow. | examples.cpp:63:26:63:30 | & ... | User-provided value |

cpp/ql/test/query-tests/Security/CWE/CWE-190/SAMATE/ArithmeticUncontrolled.expected

@@ -1 +1 @@
-| examples.cpp:65:9:65:14 | -- ... | $@ flows to here and is used in an expression which might overflow negatively. | examples.cpp:62:26:62:30 | & ... | User-provided value |
+| examples.cpp:66:9:66:14 | -- ... | $@ flows to here and is used in an expression which might overflow negatively. | examples.cpp:63:26:63:30 | & ... | User-provided value |

cpp/ql/test/query-tests/Security/CWE/CWE-190/SAMATE/IntegerOverflowTainted.expected

@@ -1 +1 @@
-| tests.c:71:9:71:15 | call to fprintf | This operation exposes system data from $@. | tests.c:55:13:55:22 | call to LogonUserA | call to LogonUserA |
+| tests.c:70:9:70:15 | call to fprintf | This operation exposes system data from $@. | tests.c:54:13:54:22 | call to LogonUserA | call to LogonUserA |

cpp/ql/test/query-tests/Security/CWE/CWE-497/SAMATE/ExposedSystemData.expected

@@ -1,7 +1,7 @@
-| tests.c:30:9:30:14 | call to printf | tests.c:30:16:30:21 | %s\n |
-| tests.c:30:9:30:14 | call to printf | tests.c:30:24:30:27 | line |
-| tests.c:44:13:44:21 | call to printLine | tests.c:44:23:44:38 | fgets() failed |
-| tests.c:63:13:63:21 | call to printLine | tests.c:63:23:63:52 | User logged in successfully. |
-| tests.c:68:13:68:21 | call to printLine | tests.c:68:23:68:40 | Unable to login. |
-| tests.c:71:9:71:15 | call to fprintf | tests.c:71:25:71:67 | User attempted access with password: %s\n |
-| tests.c:71:9:71:15 | call to fprintf | tests.c:71:70:71:77 | password |
+| tests.c:29:9:29:14 | call to printf | tests.c:29:16:29:21 | %s\n |
+| tests.c:29:9:29:14 | call to printf | tests.c:29:24:29:27 | line |
+| tests.c:43:13:43:21 | call to printLine | tests.c:43:23:43:38 | fgets() failed |
+| tests.c:62:13:62:21 | call to printLine | tests.c:62:23:62:52 | User logged in successfully. |
+| tests.c:67:13:67:21 | call to printLine | tests.c:67:23:67:40 | Unable to login. |
+| tests.c:70:9:70:15 | call to fprintf | tests.c:70:25:70:67 | User attempted access with password: %s\n |
+| tests.c:70:9:70:15 | call to fprintf | tests.c:70:70:70:77 | password |

cpp/ql/test/query-tests/Security/CWE/CWE-497/SAMATE/OutputWrite.expected

@@ -1,3 +1,3 @@
-| tests.cpp:223:12:223:16 | call to fopen | The file is never closed |
-| tests.cpp:255:12:255:15 | call to open | The file is never closed |
-| tests.cpp:281:12:281:21 | call to CreateFile | The file is never closed |
+| tests.cpp:220:12:220:16 | call to fopen | The file is never closed |
+| tests.cpp:252:12:252:15 | call to open | The file is never closed |
+| tests.cpp:278:12:278:21 | call to CreateFile | The file is never closed |

cpp/ql/test/query-tests/Security/CWE/CWE-772/SAMATE/FileNeverClosed.expected

@@ -1,2 +1,2 @@
-| tests.cpp:201:31:201:36 | call to malloc | The memory allocated here may not be released at $@. | tests.cpp:215:1:215:1 | return ... | this exit point |
-| tests.cpp:328:5:328:68 | ... = ... | The memory allocated here may not be released at $@. | tests.cpp:336:1:336:1 | return ... | this exit point |
+| tests.cpp:198:31:198:36 | call to malloc | The memory allocated here may not be released at $@. | tests.cpp:212:1:212:1 | return ... | this exit point |
+| tests.cpp:325:5:325:68 | ... = ... | The memory allocated here may not be released at $@. | tests.cpp:333:1:333:1 | return ... | this exit point |

cpp/ql/test/query-tests/Security/CWE/CWE-772/SAMATE/MemoryMayNotBeFreed.expected

@@ -1,2 +1,2 @@
-| tests.cpp:74:20:74:26 | new | This memory is never freed |
-| tests.cpp:139:24:139:29 | call to malloc | This memory is never freed |
+| tests.cpp:71:20:71:26 | new | This memory is never freed |
+| tests.cpp:136:24:136:29 | call to malloc | This memory is never freed |