From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 8 May 2026 20:07:19 +0000 (-0700)
Subject: md2: omit confusing casts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ff4f29df36377e30fa89e6b7d54df3898fbf89;p=thirdparty%2Fgnulib.git

md2: omit confusing casts

* lib/md2.c (md2_process_bytes):
Use size_t, not unsigned long, for size.
Although the code was correct it was unclear.
(md2_update_chksum, md2_compress): Omit confusing casts.
---

diff --git a/ChangeLog b/ChangeLog
index 326797527b..282f86f3dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2026-05-08  Paul Eggert  <eggert@cs.ucla.edu>
 
+	md2: omit confusing casts
+	* lib/md2.c (md2_process_bytes):
+	Use size_t, not unsigned long, for size.
+	Although the code was correct it was unclear.
+	(md2_update_chksum, md2_compress): Omit confusing casts.
+
 	Pacify -Wuseless-cast for pthread_self
 	* lib/glthread/thread.h (gl_thread_self_pointer):
 	* tests/test-pthread-mutex.c, tests/test-pthread-once2.c:
diff --git a/lib/md2.c b/lib/md2.c
index ea9a1f15e4..e02a940590 100644
--- a/lib/md2.c
+++ b/lib/md2.c
@@ -103,8 +103,8 @@ md2_process_bytes (void const *restrict buffer, size_t len,
 
   while (len > 0)
     {
-      unsigned long n = MIN (len, (16 - ctx->curlen));
-      memcpy (ctx->buf + ctx->curlen, in, (size_t) n);
+      size_t n = MIN (len, (16 - ctx->curlen));
+      memcpy (ctx->buf + ctx->curlen, in, n);
       ctx->curlen += n;
       in += n;
       len -= n;
@@ -149,7 +149,7 @@ md2_update_chksum (struct md2_ctx *ctx)
     {
       /* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the
          reference source code [and test vectors] say otherwise. */
-      L = (ctx->chksum[j] ^= PI_SUBST[(int) (ctx->buf[j] ^ L)] & 255);
+      L = (ctx->chksum[j] ^= PI_SUBST[ctx->buf[j] ^ L] & 255);
     }
 }
 
@@ -170,7 +170,7 @@ md2_compress (struct md2_ctx *ctx)
     {
       for (size_t k = 0; k < 48; k++)
         {
-          t = (ctx->X[k] ^= PI_SUBST[(int) (t & 255)]);
+          t = (ctx->X[k] ^= PI_SUBST[t & 255]);
         }
       t = (t + (unsigned char) j) & 255;
     }