Merge branch 'upstream'

[gnulib.git] / lib / md5.c

diff --git a/lib/md5.c b/lib/md5.c
index b6d307c..2213dc1 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -83,7 +83,7 @@ md5_init_ctx (struct md5_ctx *ctx)
 /* Copy the 4 byte value from v into the memory location pointed to by *cp,
    If your architecture allows unaligned access this is equivalent to
    * (uint32_t *) cp = v  */
-static void
+static inline void
 set_uint32 (char *cp, uint32_t v)
 {
   memcpy (cp, &v, sizeof v);
@@ -95,10 +95,10 @@ void *
 md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
 {
   char *r = resbuf;
-  set_uint32 (r + 0*4, SWAP (ctx->A));
-  set_uint32 (r + 1*4, SWAP (ctx->B));
-  set_uint32 (r + 2*4, SWAP (ctx->C));
-  set_uint32 (r + 3*4, SWAP (ctx->D));
+  set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A));
+  set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B));
+  set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C));
+  set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D));
 
   return resbuf;
 }