[modernization] Resolved megalinter errors

srec_cat/arglex3.h

@@ -65,7 +65,7 @@ class srec_cat_arglex3:
     srec_cat_arglex3(const srec_cat_arglex3 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     srec_cat_arglex3 &operator=(const srec_cat_arglex3 &) = delete;
 

srecord/arglex.h

@@ -391,4 +391,4 @@ class arglex
 
 };
 
-#endif // LIB_ARGLEX_H
+#endif // LIB_ARGLEX_H

srecord/arglex/tool.h

@@ -464,17 +464,17 @@ class arglex_tool:
     defcon_t contradictory_bytes;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     arglex_tool() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     arglex_tool(const arglex_tool &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     arglex_tool &operator=(const arglex_tool &) = delete;
 

srecord/arglex/tool/get_interval.cc

@@ -47,6 +47,22 @@ srecord::arglex_tool::get_interval_factor(const char *name)
             return retval;
         }
 
+    case token_within:
+        {
+            token_next();
+            srecord::input::pointer ifp = get_input();
+            interval result = srecord::input_interval(ifp);
+            return result;
+        }
+
+    case token_over:
+        {
+            token_next();
+            srecord::input::pointer ifp = get_input();
+            interval result = srecord::input_interval(ifp);
+            return result.flatten();
+        }
+
     default:
         {
             if (!can_get_number())
@@ -78,22 +94,6 @@ srecord::arglex_tool::get_interval_factor(const char *name)
             interval result(n1, n2);
             return result;
         }
-
-    case token_within:
-        {
-            token_next();
-            srecord::input::pointer ifp = get_input();
-            interval result = srecord::input_interval(ifp);
-            return result;
-        }
-
-    case token_over:
-        {
-            token_next();
-            srecord::input::pointer ifp = get_input();
-            interval result = srecord::input_interval(ifp);
-            return result.flatten();
-        }
     }
 }
 

srecord/arglex/tool/input.cc

@@ -207,7 +207,7 @@ srecord::arglex_tool::get_simple_input()
     case token_paren_begin:
         {
             token_next();
-            input::pointer ifp = get_input();
+            input::pointer ifp_local = get_input();
             for (;;)
             {
                 switch (token_cur())
@@ -216,12 +216,12 @@ srecord::arglex_tool::get_simple_input()
                 case arglex_tool::token_string:
                 case arglex_tool::token_stdio:
                 case arglex_tool::token_generator:
-                    ifp = input_catenate::create(ifp, get_input());
+                    ifp_local = input_catenate::create(ifp_local, get_input());
                     break;
 
                 case token_paren_end:
                     token_next();
-                    return ifp;
+                    return ifp_local;
 
                 default:
                     fatal_error
@@ -238,7 +238,6 @@ srecord::arglex_tool::get_simple_input()
         token_next();
         ifp = input_generator::create(this);
         return ifp;
-        break;
 
     case token_string:
         fn = value_string();
@@ -270,9 +269,6 @@ srecord::arglex_tool::get_simple_input()
     {
     case token_motorola:
         token_next();
-        // fall through...
-
-    default:
         ifp = input_file_motorola::create(fn);
         break;
 
@@ -484,7 +480,6 @@ srecord::arglex_tool::get_simple_input()
         ifp = input_file_wilson::create(fn);
         break;
     }
-    // assert(ifp);
 
     //
     // Process any additional format-specific command line options.

srecord/input.h

@@ -168,12 +168,12 @@ class input
 
 private:
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input(const input &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input &operator=(const input &) = delete;
 };

srecord/input/catenate.h

@@ -91,17 +91,17 @@ class input_catenate:
     pointer in2;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_catenate() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_catenate(const input_catenate &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_catenate &operator=(const input_catenate &) = delete;
 };

srecord/input/file.h

@@ -320,17 +320,17 @@ class input_file:
     void *get_fp();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file(const input_file &) = delete;
 
     /**
-      * the assignment operator.  Do not use.
+      * the assignment operator.
       */
     input_file &operator=(const input_file &) = delete;
 };

srecord/input/file/aomf.cc

@@ -121,7 +121,7 @@ srecord::input_file_aomf::~input_file_aomf()
 
 srecord::input_file_aomf::input_file_aomf(const std::string &a_filename) :
     srecord::input_file(a_filename)
-    
+
 {
 }
 

srecord/input/file/aomf.h

@@ -134,12 +134,12 @@ class input_file_aomf:
     int slurp();
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_aomf(const input_file_aomf &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_aomf &operator=(const input_file_aomf &) = delete;
 };

srecord/input/file/ascii_hex.h

@@ -97,17 +97,17 @@ class input_file_ascii_hex:
     enum { state_initial, state_body, state_ignore } state;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_ascii_hex() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_ascii_hex(const input_file_ascii_hex &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_ascii_hex &operator=(const input_file_ascii_hex &) = delete;
 };

srecord/input/file/atmel_generic.h

@@ -102,19 +102,20 @@ class input_file_atmel_generic:
     endian_t end;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_atmel_generic() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_atmel_generic(const input_file_atmel_generic &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
-    input_file_atmel_generic &operator=(const input_file_atmel_generic &) = delete;
+    input_file_atmel_generic &operator=(
+        const input_file_atmel_generic &) = delete;
 };
 
 };

srecord/input/file/binary.h

@@ -76,17 +76,17 @@ class input_file_binary:
     bool is_binary() const override;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_binary() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_binary(const input_file_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_binary &operator=(const input_file_binary &) = delete;
 };

srecord/input/file/brecord.h

@@ -79,17 +79,17 @@ class input_file_brecord:
     bool seen_some_input;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_brecord() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_brecord(const input_file_brecord &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_brecord &operator=(const input_file_brecord &) = delete;
 };

srecord/input/file/cosmac.h

@@ -92,17 +92,17 @@ class input_file_cosmac:
     bool seen_some_input;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_cosmac() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_cosmac(const input_file_cosmac &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_cosmac &operator=(const input_file_cosmac &) = delete;
 };

srecord/input/file/dec_binary.cc

@@ -24,7 +24,7 @@
 srecord::input_file_dec_binary::input_file_dec_binary(
         const std::string &a_file_name) :
     srecord::input_file(a_file_name)
-    
+
 {
 }
 

srecord/input/file/dec_binary.h

@@ -110,12 +110,12 @@ class input_file_dec_binary:
     unsigned long current_address{0};
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_dec_binary(const input_file_dec_binary &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_dec_binary &operator=(const input_file_dec_binary &) = delete;
 };

srecord/input/file/emon52.h

@@ -75,17 +75,17 @@ class input_file_emon52:
     void skip_white_space();
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_emon52() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_emon52(const input_file_emon52 &) = delete;
 
     /**
-      * The assignment operator.  Do not use.
+      * The assignment operator.
       */
     input_file_emon52 &operator=(const input_file_emon52 &) = delete;
 };

srecord/input/file/fairchild.h

@@ -99,12 +99,12 @@ class input_file_fairchild:
     bool file_contains_data;
 
     /**
-      * The default constructor.  Do not use.
+      * The default constructor.
       */
     input_file_fairchild() = delete;
 
     /**
-      * The copy constructor.  Do not use.
+      * The copy constructor.
       */
     input_file_fairchild(const input_file_fairchild &) = delete;