use size_t when we refer to memory sizes

diff --git a/ccache.h b/ccache.h
index 9540c8c835fa86136cd322d0b0f31aad1762c474..1a267ac32b9e4e3e8697019b9f626e6405a0ab74 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -56,7 +56,7 @@ int hash_fd(struct mdfour *md, int fd);
 int hash_file(struct mdfour *md, const char *fname);
 char *hash_result(struct mdfour *md);
 void hash_result_as_bytes(struct mdfour *md, unsigned char *out);
-void hash_buffer(struct mdfour *md, const char *s, int len);
+void hash_buffer(struct mdfour *md, const char *s, size_t len);
 
 void cc_log(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
 void fatal(const char *format, ...) ATTR_FORMAT(printf, 1, 2);

diff --git a/hash.c b/hash.c
index bc300cef12beeb19bdc8210f3e6a401818e71604..e2159d7c5a95a6a47c2c56394bf7c822189b7cc2 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
-void hash_buffer(struct mdfour *md, const char *s, int len)
+void hash_buffer(struct mdfour *md, const char *s, size_t len)
 {
        mdfour_update(md, (unsigned char *)s, len);
 }
@@ -51,7 +51,7 @@ void hash_int(struct mdfour *md, int x)
 int hash_fd(struct mdfour *md, int fd)
 {
        char buf[1024];
-       int n;
+       size_t n;
 
        while ((n = read(fd, buf, sizeof(buf))) > 0) {
                hash_buffer(md, buf, n);

diff --git a/mdfour.c b/mdfour.c
index e815012474f40016b94c855bf6b3186f1f54922b..f156153c1a9ebbd58eb92c1c38606fc272dbb434 100644 (file)
--- a/mdfour.c
+++ b/mdfour.c
@@ -110,7 +110,7 @@ void mdfour_begin(struct mdfour *md)
 }
 
 
-static void mdfour_tail(const unsigned char *in, int n)
+static void mdfour_tail(const unsigned char *in, size_t n)
 {
        unsigned char buf[128];
        uint32_t M[16];
@@ -137,7 +137,7 @@ static void mdfour_tail(const unsigned char *in, int n)
        }
 }
 
-void mdfour_update(struct mdfour *md, const unsigned char *in, int n)
+void mdfour_update(struct mdfour *md, const unsigned char *in, size_t n)
 {
        uint32_t M[16];
 
@@ -149,7 +149,7 @@ void mdfour_update(struct mdfour *md, const unsigned char *in, int n)
        }
 
        if (md->tail_len) {
-               int len = 64 - md->tail_len;
+               size_t len = 64 - md->tail_len;
                if (len > n) len = n;
                memcpy(md->tail+md->tail_len, in, len);
                md->tail_len += len;

diff --git a/mdfour.h b/mdfour.h
index 302ac44c81008a39ac620a05a05c52a09ba642a4..f2dc87155fdb761e423ccbc427b4a4963972eec3 100644 (file)
--- a/mdfour.h
+++ b/mdfour.h
@@ -22,17 +22,18 @@
 #ifndef MDFOUR_H
 #define MDFOUR_H
 
+#include <stddef.h>
 #include <inttypes.h>
 
 struct mdfour {
        uint32_t A, B, C, D;
-       uint32_t totalN;
+       size_t totalN;
        unsigned char tail[64];
-       unsigned tail_len;
+       size_t tail_len;
 };
 
 void mdfour_begin(struct mdfour *md);
-void mdfour_update(struct mdfour *md, const unsigned char *in, int n);
+void mdfour_update(struct mdfour *md, const unsigned char *in, size_t n);
 void mdfour_result(struct mdfour *md, unsigned char *out);
 
 #endif

diff --git a/unify.c b/unify.c
index a5611c1959f142c6c9071508b8961e4341632bf0..84ff093ea3b458ebd43cac8d047c1add41d6408e 100644 (file)
--- a/unify.c
+++ b/unify.c
@@ -102,7 +102,7 @@ static void build_table(void)
 static void pushchar(struct mdfour *hash, unsigned char c)
 {
        static unsigned char buf[64];
-       static int len;
+       static size_t len;
 
        if (c == 0) {
                if (len > 0) {