cobol: Minor changes to quiet cppcheck warnings. [PR119324]

gcc/cobol/ChangeLog:

	PR cobol/119324
	* cbldiag.h (location_dump): Inline suppression of knownConditionTrueFalse.
	* genapi.cc (parser_statement_begin): Combine two if() statements.
	* genutil.cc (get_binary_value): File-level suppression of duplicateBreak.
	* symbols.cc (symbol_elem_cmp): File-level suppression of duplicateBreak.

diff --git a/gcc/cobol/cbldiag.h b/gcc/cobol/cbldiag.h
index 39f13690bec9867eca4ec67980a3c73fcacfed69..dd16190fbd8751df1f8974e64872b6292e4fc777 100644 (file)
--- a/gcc/cobol/cbldiag.h
+++ b/gcc/cobol/cbldiag.h
@@ -122,7 +122,7 @@ static void
 location_dump( const char func[], int line, const char tag[], const LOC& loc) {
   extern int yy_flex_debug; // cppcheck-suppress shadowVariable
   if( yy_flex_debug ) {
-    const char *detail = gcobol_getenv("update_location");
+    const char *detail = gcobol_getenv("update_location"); // cppcheck-suppress knownConditionTrueFalse
     if( detail ) {
       fprintf(stderr, "%s:%d: %s location (%d,%d) to (%d,%d)\n",
               func, line, tag,

diff --git a/gcc/cobol/genapi.cc b/gcc/cobol/genapi.cc
index 20341643182e618c51490dc9934db5008a64e5a6..c9d2da481ab95051eec868d284c8fe7d4bcc4f24 100644 (file)
--- a/gcc/cobol/genapi.cc
+++ b/gcc/cobol/genapi.cc
@@ -1198,12 +1198,9 @@ parser_statement_begin( const cbl_name_t statement_name,
   if( exception_processing )
     {
     store_location_stuff(statement_name);
-    }
-
-  if( exception_processing )
-    {
     set_exception_environment(ecs, dcls);
     }
+
   sv_is_i_o = false;
   }
 

diff --git a/gcc/cobol/genutil.cc b/gcc/cobol/genutil.cc
index 7895ea8d71ecf5340b1ea875a393f2a91a67edc0..a5f69a09eec9cd6842766058bbf1f67b7f16d3c7 100644 (file)
--- a/gcc/cobol/genutil.cc
+++ b/gcc/cobol/genutil.cc
@@ -27,6 +27,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+// cppcheck-suppress-file duplicateBreak
+
 #include "cobol-system.h"
 #include "coretypes.h"
 #include "tree.h"
@@ -1267,7 +1270,7 @@ get_binary_value( tree value,
                             cbl_field_type_str(field->type) );
       cbl_internal_error("%s", err);
       abort();
-      // break; // break not needed after abort();
+      break;
       }
     }
 

diff --git a/gcc/cobol/symbols.cc b/gcc/cobol/symbols.cc
index 7d6a9554bddefa32b5b582903f72290294bd15fc..f2cd1b55f802c045f20d73fb2a5f7a626c1a33eb 100644 (file)
--- a/gcc/cobol/symbols.cc
+++ b/gcc/cobol/symbols.cc
@@ -28,6 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// cppcheck-suppress-file duplicateBreak
+
 #include "config.h"
 #include <fstream> // Before cobol-system because it uses poisoned functions
 #include "cobol-system.h"
@@ -500,13 +502,13 @@ symbol_elem_cmp( const void *K, const void *E )
       }
       return strcasecmp(key.name, elem.name);
     }
-    // break; // This break not needed if all options do a return.
+    break;
   case SymSpecial:
     return special_pair_cmp(k->elem.special, e->elem.special)? 0 : 1;
-    // break; // This break not needed after return.
+    break;
   case SymAlphabet:
     return strcasecmp(k->elem.alphabet.name, e->elem.alphabet.name);
-    // break; // This break not needed after return.
+    break;
   case SymFile:
     // If the key is global, so must be the found element.
     if( (cbl_file_of(k)->attr & global_e) == global_e &&
@@ -514,7 +516,7 @@ symbol_elem_cmp( const void *K, const void *E )
       return 1;
     }
     return strcasecmp(k->elem.file.name, e->elem.file.name);
-    // break; // This break not needed after return.
+    break;
   }
   assert(k->type == SymField);