Rule 15.3: Fix message, remove dead code

Author: lcartey

c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql

@@ -19,14 +19,6 @@ predicate isPartOfSwitch(Stmt goto) {
   exists(SwitchStmt switch | switch.getStmt() = goto.getParent())
 }
 
-Stmt getNextStmt(ControlFlowNode node) {
-  node.getASuccessor() = result
-  or
-  exists(ControlFlowNode other |
-    node.getASuccessor() = other and other != result and result = getNextStmt(other)
-  )
-}
-
 SwitchCase getSwitchCase(Stmt stmt) {
   exists(int index, SwitchStmt switch |
     getStmtInSwitch(switch, stmt, index) and getStmtInSwitch(switch, result, index - 1)
@@ -66,5 +58,5 @@ where
       isPartOfSwitch(goto) and not getSwitchCase(goto) = getSwitchCase(target)
     )
   )
-select goto, "The $@ statement and its $@ are not declared or enclosed in the same block. test",
-  goto, "goto", target, "label"
+select goto, "The $@ statement and its $@ are not declared or enclosed in the same block.", goto,
+  "goto", target, "label"

c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected

@@ -1,3 +1,3 @@
-| test.c:2:3:2:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. test | test.c:2:3:2:10 | goto ... | goto | test.c:4:3:4:5 | label ...: | label |
-| test.c:37:3:37:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. test | test.c:37:3:37:10 | goto ... | goto | test.c:41:3:41:5 | label ...: | label |
-| test.c:52:5:52:12 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. test | test.c:52:5:52:12 | goto ... | goto | test.c:55:3:55:5 | label ...: | label |
+| test.c:2:3:2:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:2:3:2:10 | goto ... | goto | test.c:4:3:4:5 | label ...: | label |
+| test.c:37:3:37:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:37:3:37:10 | goto ... | goto | test.c:41:3:41:5 | label ...: | label |
+| test.c:52:5:52:12 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:52:5:52:12 | goto ... | goto | test.c:55:3:55:5 | label ...: | label |