More misc size_t issues

diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index e38a365..beb31ba 100644 (file)
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -288,7 +288,7 @@ dbiIndex db3New(rpmdb rpmdb, rpm_tag_t rpmtag)
        for (o = dbOpts; o && *o; o = oe) {
            struct poptOption *opt;
            const char * tok;
-           int argInfo;
+           unsigned int argInfo;
 
            /* Skip leading white space. */
            while (*o && xisspace(*o))

diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 21cd921..17b8d9e 100644 (file)
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -817,7 +817,7 @@ static struct FDIO_s ufdio_s = {
 };
 FDIO_t ufdio = &ufdio_s ;
 
-int timedRead(FD_t fd, void * bufptr, int length)
+ssize_t timedRead(FD_t fd, void * bufptr, size_t length)
 {
     return ufdio->read(fd, bufptr, length);
 }

diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 38d5e10..47e0ce2 100644 (file)
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -185,7 +185,7 @@ int ufdGetFile( FD_t sfd, FD_t tfd);
  * only S_ISREG() files are read, nothing to do with timed... 
  * TODO: get this out of the API
  */
-int timedRead(FD_t fd, void * bufptr, int length);
+ssize_t timedRead(FD_t fd, void * bufptr, size_t length);
 
 /** \ingroup rpmio
  * Identify per-desciptor I/O operation statistics.

diff --git a/rpmio/rpmlua.h b/rpmio/rpmlua.h
index 02d97ab..145cdbb 100644 (file)
--- a/rpmio/rpmlua.h
+++ b/rpmio/rpmlua.h
@@ -14,10 +14,10 @@ typedef enum rpmluavType_e {
 
 struct rpmlua_s {
     lua_State *L;
-    int pushsize;
+    size_t pushsize;
     int storeprint;
-    int printbufsize;
-    int printbufused;
+    size_t printbufsize;
+    size_t printbufused;
     char *printbuf;
 };
 

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 8221385..9ca66c8 100644 (file)
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -561,7 +561,7 @@ int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen)
            return 1;
 
 if (_debug && _print)
-fprintf(stderr, "   hash[%u] -- %s\n", plen, pgpHexStr(p, plen));
+fprintf(stderr, "   hash[%zu] -- %s\n", plen, pgpHexStr(p, plen));
        if (_digp && _digp->pubkey_algo == 0) {
            _digp->hashlen = sizeof(*v) + plen;
            _digp->hash = memcpy(xmalloc(_digp->hashlen), v, _digp->hashlen);