[lmi-commits] [lmi] master b1bae6c 3/5: Expunge redundant class-keys

[Greg Chicares]

branch: master
commit b1bae6c685f53ce2b3d27c98f0491b857ae359ce
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Expunge redundant class-keys
---
 md5.cpp             | 14 +++++++-------
 md5sum_cli.cpp      |  2 +-
 rate_table_tool.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/md5.cpp b/md5.cpp
index a83d001..71fb12f 100644
--- a/md5.cpp
+++ b/md5.cpp
@@ -108,7 +108,7 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 
0, ... */ };
  *      struct md5_ctx *ctx;
  */
 void
-md5_init_ctx (struct md5_ctx* ctx)
+md5_init_ctx (md5_ctx* ctx)
 {
   ctx->A = (md5_uint32) 0x67452301;
   ctx->B = (md5_uint32) 0xefcdab89;
@@ -131,7 +131,7 @@ md5_init_ctx (struct md5_ctx* ctx)
  *      const struct md5_ctx *ctx;
  *      void *resbuf;
  */
-void* md5_read_ctx (struct md5_ctx const* ctx, void* resbuf)
+void* md5_read_ctx (md5_ctx const* ctx, void* resbuf)
 {
   ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
   ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
@@ -154,7 +154,7 @@ void* md5_read_ctx (struct md5_ctx const* ctx, void* resbuf)
  *      void *resbuf;
  */
 void *
-md5_finish_ctx (struct md5_ctx* ctx, void* resbuf)
+md5_finish_ctx (md5_ctx* ctx, void* resbuf)
 {
   /* Take yet unprocessed bytes into account. */
   md5_uint32 bytes = ctx->buflen;
@@ -195,7 +195,7 @@ md5_stream (std::FILE* stream, void* resblock)
 {
   /* Important: BLOCKSIZE must be a multiple of 64. */
 #define BLOCKSIZE 4096
-  struct md5_ctx ctx;
+  md5_ctx ctx;
   char buffer[BLOCKSIZE + 72];
   std::size_t sum;
 
@@ -257,7 +257,7 @@ md5_stream (std::FILE* stream, void* resblock)
 void *
 md5_buffer (char const* buffer, std::size_t len, void* resblock)
 {
-  struct md5_ctx ctx;
+  md5_ctx ctx;
 
   /* Initialize the computation context. */
   md5_init_ctx (&ctx);
@@ -277,7 +277,7 @@ md5_buffer (char const* buffer, std::size_t len, void* 
resblock)
  *      struct md5_ctx *ctx;
  */
 void
-md5_process_bytes (void const* buffer, std::size_t a_len, struct md5_ctx* ctx)
+md5_process_bytes (void const* buffer, std::size_t a_len, md5_ctx* ctx)
 {
   md5_uint32 len = bourn_cast<md5_uint32>(a_len);
   /* When we already have some bits in our internal buffer concatenate
@@ -342,7 +342,7 @@ md5_process_bytes (void const* buffer, std::size_t a_len, 
struct md5_ctx* ctx)
  *      struct md5_ctx *ctx;
  */
 void
-md5_process_block (void const* buffer, std::size_t a_len, struct md5_ctx* ctx)
+md5_process_block (void const* buffer, std::size_t a_len, md5_ctx* ctx)
 {
   md5_uint32 len = bourn_cast<md5_uint32>(a_len);
   md5_uint32 correct_words[16];
diff --git a/md5sum_cli.cpp b/md5sum_cli.cpp
index fa61d7a..31fae16 100644
--- a/md5sum_cli.cpp
+++ b/md5sum_cli.cpp
@@ -94,7 +94,7 @@ int try_main(int argc, char* argv[])
     bool all_ok = true;
     int c;
     int option_index = 0;
-    struct Option long_options[] =
+    Option long_options[] =
         {
             {"binary"      ,NO_ARG   ,nullptr ,'b'            ,nullptr ,""},
             {"check"       ,NO_ARG   ,nullptr ,'c'            ,nullptr ,""},
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index c7ae079..ebbb133 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -439,7 +439,7 @@ int try_main(int argc, char* argv[])
 {
     int c;
     int option_index = 0;
-    static struct Option long_options[] =
+    static Option long_options[] =
       {
         {"help"        ,NO_ARG   ,nullptr ,'h' ,nullptr ,"display this help 
and exit"},
         {"delete"      ,REQD_ARG ,nullptr ,'d' ,nullptr ,"delete table #n from 
database"},