1 files changed, 9 insertions, 17 deletions

diff --git a/gcc/cobol/except.cc b/gcc/cobol/except.cc
index d477139..60b8416 100644
--- a/gcc/cobol/except.cc
+++ b/gcc/cobol/except.cc
@@ -51,7 +51,7 @@ static const ec_descr_t *
 ec_type_descr( ec_type_t type ) {
   auto p = std::find( __gg__exception_table, __gg__exception_table_end, type );
   if( p == __gg__exception_table_end ) {
-    cbl_internal_error("no such exception: 0x%04x", type);
+    cbl_internal_error("no such exception: 0x%x", type);
   }
   return p;
 }
@@ -77,7 +77,7 @@ ec_level( ec_type_t ec ) {
 
 void
 cbl_enabled_exception_t::dump( int i ) const {
-  cbl_message(2, "cbl_enabled_exception_t: %2d  {%s, %s, %s, %zu}",
+  cbl_message(2, "cbl_enabled_exception_t: %2d  {%s, %s, %zu}",
               i,
               location? "location" : "    none",
               ec_type_str(ec),
@@ -99,23 +99,25 @@ cbl_enabled_exceptions_t::dump() const {
   }
   int i = 1;
   for( auto& elem : *this ) {
-    dbgmsg("cbl_enabled_exceptions_t: %2d  {%s, %s, %zu}",
+    dbgmsg("cbl_enabled_exceptions_t: %2d  {%s, %s, %lu}",
            i++,
            elem.location? "with location" : "  no location", 
            ec_type_str(elem.ec),
-           elem.file );
+           gb4(elem.file) );
   }
   std::swap(debug, yydebug);
 }
 
+// cppcheck-suppress-begin [useStlAlgorithm] because why?
 uint32_t 
 cbl_enabled_exceptions_t::status() const {
   uint32_t status_word = 0;
   for( const auto& ena : *this ) {
     status_word |= (EC_ALL_E & ena.ec );
-  }
+  } 
   return status_word;
 }
+// cppcheck-suppress-end useStlAlgorithm
 
 std::vector<uint64_t>
 cbl_enabled_exceptions_t::encode() const {
@@ -133,13 +135,13 @@ void
 cbl_enabled_exceptions_t::turn_on_off( bool enabled,
                                        bool location,
                                        ec_type_t type,
-                                       std::set<size_t> files )
+                                       const std::set<size_t>& files )
 {
   // Update current enabled ECs tree on leaving this function. 
   class update_parser_t {
     const cbl_enabled_exceptions_t& ecs;
   public:
-    update_parser_t(const cbl_enabled_exceptions_t& ecs) : ecs(ecs) {}
+    explicit update_parser_t(const cbl_enabled_exceptions_t& ecs) : ecs(ecs) {}
     ~update_parser_t() {
       tree ena = parser_compile_ecs(ecs.encode());
       current_enabled_ecs(ena);
@@ -244,16 +246,6 @@ cbl_enabled_exceptions_t::match( ec_type_t type, size_t file ) const {
   return output != end()? &*output : NULL;
 }
 
-class choose_declarative {
-  size_t program;
- public:
-  choose_declarative( size_t program ) : program(program) {}
-
-  bool operator()( const cbl_declarative_t& dcl ) {
-    return dcl.global || program == symbol_at(dcl.section)->program;
-  }
-};
-
 bool
 sort_supers_last( const cbl_declarative_t& a, const cbl_declarative_t& b ) {
   if( symbol_at(a.section)->program == symbol_at(b.section)->program ) {