[openwrt/openwrt] mtd: fix building with GCC 15.1

LEDE Commits lede-commits at lists.infradead.org
Sun Jun 8 03:20:24 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/090add1e8783b4e82f87851f8ec36c814809764b

commit 090add1e8783b4e82f87851f8ec36c814809764b
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Sat May 3 12:12:12 2025 +0100

    mtd: fix building with GCC 15.1
    
    Convert old style declarations to modern ones.
    
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/18600
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/system/mtd/src/md5.c | 18 +++++-------------
 package/system/mtd/src/md5.h |  6 +++---
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/package/system/mtd/src/md5.c b/package/system/mtd/src/md5.c
index 2039760383..f7988e6414 100644
--- a/package/system/mtd/src/md5.c
+++ b/package/system/mtd/src/md5.c
@@ -48,7 +48,7 @@
  */
 
 /* forward declaration */
-static void Transform ();
+static void Transform (UINT4 *buf, UINT4 *in);
 
 static unsigned char PADDING[64] = {
   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -102,8 +102,7 @@ static unsigned char PADDING[64] = {
 /* The routine MD5_Init initializes the message-digest context
    mdContext. All fields are set to zero.
  */
-void MD5_Init (mdContext)
-MD5_CTX *mdContext;
+void MD5_Init (MD5_CTX *mdContext)
 {
   mdContext->i[0] = mdContext->i[1] = (UINT4)0;
 
@@ -119,10 +118,7 @@ MD5_CTX *mdContext;
    account for the presence of each of the characters inBuf[0..inLen-1]
    in the message whose digest is being computed.
  */
-void MD5_Update (mdContext, inBuf, inLen)
-MD5_CTX *mdContext;
-unsigned char *inBuf;
-unsigned int inLen;
+void MD5_Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
 {
   UINT4 in[16];
   int mdi;
@@ -157,9 +153,7 @@ unsigned int inLen;
 /* The routine MD5Final terminates the message-digest computation and
    ends with the desired message digest in mdContext->digest[0...15].
  */
-void MD5_Final (hash, mdContext)
-unsigned char hash[];
-MD5_CTX *mdContext;
+void MD5_Final (unsigned char hash[], MD5_CTX *mdContext)
 {
   UINT4 in[16];
   int mdi;
@@ -200,9 +194,7 @@ MD5_CTX *mdContext;
 
 /* Basic MD5 step. Transforms buf based on in.
  */
-static void Transform (buf, in)
-UINT4 *buf;
-UINT4 *in;
+static void Transform (UINT4 *buf, UINT4 *in)
 {
   UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
 
diff --git a/package/system/mtd/src/md5.h b/package/system/mtd/src/md5.h
index f7a0c96418..71e8b00e2d 100644
--- a/package/system/mtd/src/md5.h
+++ b/package/system/mtd/src/md5.h
@@ -57,9 +57,9 @@ typedef struct {
   unsigned char digest[16];     /* actual digest after MD5Final call */
 } MD5_CTX;
 
-void MD5_Init ();
-void MD5_Update ();
-void MD5_Final ();
+void MD5_Init (MD5_CTX *mdContext);
+void MD5_Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
+void MD5_Final (unsigned char hash[], MD5_CTX *mdContext);
 
 #define __MD5_INCLUDE__
 #endif /* __MD5_INCLUDE__ */




More information about the lede-commits mailing list