More assorted int -> size_t uses

diff --git a/rpmio/digest.c b/rpmio/digest.c
index 10ed6d1..25e5dfa 100644 (file)
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -98,17 +98,17 @@ DPRINTF((stderr, "*** Init(%x) ctx %p hashctx %p\n", flags, ctx, ctx->hashctx));
 int
 rpmDigestUpdate(DIGEST_CTX ctx, const void * data, size_t len)
 {
-    unsigned int partlen;
+    size_t partlen;
     const unsigned char *ptr = data;
 
     if (ctx == NULL)
        return -1;
 
-DPRINTF((stderr, "*** Update(%p,%p,%d) hashctx %p \"%s\"\n", ctx, data, len, ctx->hashctx, ((char *)data)));
+DPRINTF((stderr, "*** Update(%p,%p,%zd) hashctx %p \"%s\"\n", ctx, data, len, ctx->hashctx, ((char *)data)));
    partlen = ~(unsigned int)0xFF;
    while (len > 0) {
        if (len < partlen) {
-               partlen = (unsigned int)len;
+               partlen = len;
        }
        HASH_Update(ctx->hashctx, ptr, partlen);
        ptr += partlen;
@@ -122,15 +122,15 @@ rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii)
 {
     unsigned char * digest;
     char * t;
-    int i;
-    unsigned int digestlen;
+    size_t i;
+    size_t digestlen;
 
     if (ctx == NULL)
        return -1;
     digestlen = HASH_ResultLenContext(ctx->hashctx);
     digest = xmalloc(digestlen);
 
-DPRINTF((stderr, "*** Final(%p,%p,%p,%d) hashctx %p digest %p\n", ctx, datap, lenp, asAscii, ctx->hashctx, digest));
+DPRINTF((stderr, "*** Final(%p,%p,%p,%zd) hashctx %p digest %p\n", ctx, datap, lenp, asAscii, ctx->hashctx, digest));
 /* FIX: check rc */
     HASH_End(ctx->hashctx, digest, &digestlen, digestlen);
 

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 5f3d350..40e4e5a 100644 (file)
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -642,7 +642,7 @@ static int XpoptParseArgvString(const char * s, int * argcPtr, const char *** ar
     int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
     const char ** argv = malloc(sizeof(*argv) * argvAlloced);
     int argc = 0;
-    int buflen = strlen(s) + 1;
+    size_t buflen = strlen(s) + 1;
     char * buf = memset(alloca(buflen), 0, buflen);
     int rc = POPT_ERROR_MALLOC;
 
@@ -716,7 +716,7 @@ int rpmGlob(const char * patterns, int * argcPtr, char *** argvPtr)
     char * old_ctype = NULL;
     const char * t;
 #endif
-       size_t maxb, nb;
+    size_t maxb, nb;
     int i, j;
     int rc;