[lmi-commits] [lmi] master 9c34f2a 12/16: Don't mix std::size_t with fixed-width integer types

[Greg Chicares]

branch: master
commit 9c34f2ad5b7d3002f8b56d165b7cdfa6ab0accc4
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Don't mix std::size_t with fixed-width integer types
---
 md5.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/md5.cpp b/md5.cpp
index 5a7f6a0..ef0216e 100644
--- a/md5.cpp
+++ b/md5.cpp
@@ -42,6 +42,8 @@
 
 #include "pchfile.hpp"
 
+#include "bourn_cast.hpp"
+
 // Suppress this because we wouldn't have glibc's 'config.h'.
 //#if defined HAVE_CONFIG_H
 //# include <config.h>
@@ -269,15 +271,16 @@ 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 len, struct md5_ctx* ctx)
+md5_process_bytes (void const* buffer, std::size_t a_len, struct md5_ctx* ctx)
 {
+  md5_uint32 len = bourn_cast<md5_uint32>(a_len);
   /* When we already have some bits in our internal buffer concatenate
    * both inputs first.
    */
   if (ctx->buflen != 0)
     {
-      std::size_t left_over = ctx->buflen;
-      std::size_t add = 128 - left_over > len ? len : 128 - left_over;
+      md5_uint32 left_over = ctx->buflen;
+      md5_uint32 add = 128 - left_over > len ? len : 128 - left_over;
 
       std::memcpy (&ctx->buffer[left_over], buffer, add);
       ctx->buflen += add;
@@ -333,8 +336,9 @@ md5_process_bytes (void const* buffer, std::size_t len, 
struct md5_ctx* ctx)
  *      struct md5_ctx *ctx;
  */
 void
-md5_process_block (void const* buffer, std::size_t len, struct md5_ctx* ctx)
+md5_process_block (void const* buffer, std::size_t a_len, struct md5_ctx* ctx)
 {
+  md5_uint32 len = bourn_cast<md5_uint32>(a_len);
   md5_uint32 correct_words[16];
 /* GWC: Conform to C++98.
  * const md5_uint32 *words = buffer;