C++: Apply misc readability fixes

Command:

~~~sh
run-clang-tidy-14 -header-filter='.*' -checks='-*,readability-redundant-access-specifiers,readability-container-size-empty,readability-static-accessed-through-instance,readability-delete-null-pointer,readability-isolate-declaration' -fix
~~~

Afterwards fix white spaces (newline, indentation).

Author: jtxa

srec_info/main.cc

@@ -62,7 +62,7 @@ main(int argc, char **argv)
         }
         cmdline.token_next();
     }
-    if (infile.size() == 0U)
+    if (infile.empty())
         infile.push_back(cmdline.get_input());
 
     std::cout << std::hex << std::uppercase;

srecord/arglex.h

@@ -348,7 +348,6 @@ class arglex
       */
     void read_arguments_file(const char *filename);
 
-private:
     typedef std::list<std::string> deprecated_options_t;
 
     /**

srecord/arglex/tool/input.cc

@@ -598,7 +598,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_bitnot::create
@@ -619,7 +620,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_negative::create
@@ -640,7 +642,8 @@ srecord::arglex_tool::get_input()
                 endian_t end = get_endian_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_checksum_positive::create
@@ -807,7 +810,8 @@ srecord::arglex_tool::get_input()
                 bool inclusive = get_inclusive_by_token();
                 token_next();
                 unsigned long address;
-                int nbytes, width;
+                int nbytes;
+                int width;
                 get_address_nbytes_width(name, address, nbytes, width);
                 ifp =
                     input_filter_interval_length::create

srecord/input/file.h

@@ -77,7 +77,6 @@ class input_file:
     // See base class for documentation.
     void disable_checksum_validation();
 
-protected:
     /**
       * The constructor.  The input will be taken from the named file
       * (or the standard input if the filename is "-").

srecord/input/file/aomf.cc

@@ -115,8 +115,7 @@ o96name(int x)
 
 srecord::input_file_aomf::~input_file_aomf()
 {
-    if (current_buffer)
-        delete [] current_buffer;
+    delete [] current_buffer;
 }
 
 
@@ -165,7 +164,7 @@ srecord::input_file_aomf::slurp()
     --length; // includes checksum byte
     if (length > current_maximum)
     {
-        if (current_buffer)
+
             delete [] current_buffer;
         while (current_maximum < length)
             current_maximum = current_maximum * 2 + 64;

srecord/input/file/hp64k.cc

@@ -98,8 +98,10 @@ srecord::input_file_hp64k::read_u16be(uint16_t *dest)
 bool
 srecord::input_file_hp64k::read_datarec(record &result)
 {
-    uint16_t recsize, datasize;
-    uint16_t load_l, load_h;
+    uint16_t recsize;
+    uint16_t datasize;
+    uint16_t load_l;
+    uint16_t load_h;
     size_t tmp_addr;
 
     if (!read_u16be(&recsize))
@@ -197,7 +199,11 @@ srecord::input_file_hp64k::read_hdr(record &result)
 bool
 srecord::input_file_hp64k::read_pir(record &result)
 {
-    uint16_t pirlen, width, base, xfer_l, xfer_h;
+    uint16_t pirlen;
+    uint16_t width;
+    uint16_t base;
+    uint16_t xfer_l;
+    uint16_t xfer_h;
     uint32_t xfer;
 
     if (!read_u16be(&pirlen))

srecord/input/file/intel.cc

@@ -23,8 +23,7 @@
 
 srecord::input_file_intel::~input_file_intel()
 {
-    if (pushback)
-        delete pushback;
+    delete pushback;
 }
 
 

srecord/input/file/ti_tagged.h

@@ -73,7 +73,6 @@ class input_file_ti_tagged:
       */
     int get_char();
 
-private:
     typedef input_file inherited;
 
     /**

srecord/input/file/wilson.h

@@ -78,7 +78,6 @@ class input_file_wilson:
       */
     input_file_wilson(const std::string &file_name);
 
-private:
     /**
       * The read_inner method is used to read a record from the input.
       * The #read method is a wrapper around this method.

srecord/input/filter/message/gcrypt.h

@@ -60,7 +60,7 @@ class input_filter_message_gcrypt:
     input_filter_message_gcrypt(const input::pointer &deeper,
         unsigned long address, int algo, bool hmac);
 
-private:
+
     /**
       * The create class method is used to create a new dynamically
       * allocated instance of this class.

srecord/memory.cc

@@ -80,8 +80,7 @@ srecord::memory::clear()
     execution_start_address = 0;
     for (int j = 0; j < nchunks; ++j)
         delete chunk[j];
-    if (chunk)
-        delete [] chunk;
+    delete [] chunk;
     nchunks = 0;
     nchunks_max = 0;
     chunk = 0;

srecord/quit/prefix.cc

@@ -51,7 +51,7 @@ srecord::quit_prefix::exit(int n)
 void
 srecord::quit_prefix::message_v(const char *fmt, va_list ap)
 {
-    if (prefix != "")
+    if (!prefix.empty())
     {
         char buf[1024];
         vsnprintf(buf, sizeof(buf), fmt, ap);