Fix a bunch of string format mismatches found by gcc's variadic checks

Patch from Michal Marek

diff --git a/lib/query.c b/lib/query.c
index 523390c..111107c 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -641,12 +641,12 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
            rpmlog(RPMLOG_NOTICE, _("invalid package number: %s\n"), arg);
            return 1;
        }
-       rpmlog(RPMLOG_DEBUG, _("package record number: %u\n"), recOffset);
+       rpmlog(RPMLOG_DEBUG, _("package record number: %lu\n"), recOffset);
        /* RPMDBI_PACKAGES */
        qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, &recOffset, sizeof(recOffset));
        if (qva->qva_mi == NULL) {
            rpmlog(RPMLOG_NOTICE,
-               _("record %u could not be read\n"), recOffset);
+               _("record %lu could not be read\n"), recOffset);
            res = 1;
        } else
            res = rpmcliShowMatches(qva, ts);

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index d08e896..38bb724 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -1006,7 +1006,7 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
        tid = (time_t)thistid;
        rpmlog(RPMLOG_NOTICE,
                _("Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"),
-                       numAdded, numRemoved, ctime(&tid), tid);
+                       numAdded, numRemoved, ctime(&tid), thistid);
 
        rc = rpmtsCheck(ts);
        ps = rpmtsProblems(ts);

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 4e3dbc3..ee4ecf5 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -205,7 +205,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
            case '(':
                /* XXX Fail if nested parens. */
                if (level++ != 0) {
-                   rpmlog(RPMLOG_ERR, _("extra '(' in package label: %s\n"), keyp);
+                   rpmlog(RPMLOG_ERR, _("extra '(' in package label: %s\n"), (const char*)keyp);
                    return NULL;
                }
                /* Parse explicit epoch. */
@@ -223,7 +223,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
            case ')':
                /* XXX Fail if nested parens. */
                if (--level != 0) {
-                   rpmlog(RPMLOG_ERR, _("missing '(' in package label: %s\n"), keyp);
+                   rpmlog(RPMLOG_ERR, _("missing '(' in package label: %s\n"), (const char*)keyp);
                    return NULL;
                }
                /* Don't copy trailing ')' */
@@ -231,7 +231,7 @@ rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
            }
        }
        if (level) {
-           rpmlog(RPMLOG_ERR, _("missing ')' in package label: %s\n"), keyp);
+           rpmlog(RPMLOG_ERR, _("missing ')' in package label: %s\n"), (const char*)keyp);
            return NULL;
        }
        *t = '\0';

diff --git a/lib/signature.c b/lib/signature.c
index 6e8949d..42903ea 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -115,7 +115,7 @@ static inline rpmRC printSize(FD_t fd, size_t siglen, size_t pad, rpm_off_t data
        return RPMRC_FAIL;
 
     rpmlog(RPMLOG_DEBUG,
-       _("Expected size: %12d = lead(%d)+sigs(%zd)+pad(%zd)+data(%zd)\n"),
+       _("Expected size: %12zd = lead(%d)+sigs(%zd)+pad(%zd)+data(%d)\n"),
                RPMLEAD_SIZE+siglen+pad+datalen,
                RPMLEAD_SIZE, siglen, pad, datalen);
     rpmlog(RPMLOG_DEBUG,
@@ -431,7 +431,7 @@ static int makePGPSignature(const char * file, rpmSigTag * sigTagp,
     }
 
     *pktlenp = st.st_size;
-    rpmlog(RPMLOG_DEBUG, _("PGP sig size: %d\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("PGP sig size: %zd\n"), *pktlenp);
     *pktp = xmalloc(*pktlenp);
 
     {  FD_t fd;
@@ -450,7 +450,7 @@ static int makePGPSignature(const char * file, rpmSigTag * sigTagp,
        }
     }
 
-    rpmlog(RPMLOG_DEBUG, _("Got %d bytes of PGP sig\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("Got %zd bytes of PGP sig\n"), *pktlenp);
 
 #ifdef NOTYET
     /* Parse the signature, change signature tag as appropriate. */
@@ -542,7 +542,7 @@ static int makeGPGSignature(const char * file, rpmSigTag * sigTagp,
     }
 
     *pktlenp = st.st_size;
-    rpmlog(RPMLOG_DEBUG, _("GPG sig size: %d\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("GPG sig size: %zd\n"), *pktlenp);
     *pktp = xmalloc(*pktlenp);
 
     {  FD_t fd;
@@ -561,7 +561,7 @@ static int makeGPGSignature(const char * file, rpmSigTag * sigTagp,
        }
     }
 
-    rpmlog(RPMLOG_DEBUG, _("Got %d bytes of GPG sig\n"), *pktlenp);
+    rpmlog(RPMLOG_DEBUG, _("Got %zd bytes of GPG sig\n"), *pktlenp);
 
     /* Parse the signature, change signature tag as appropriate. */
     dig = pgpNewDig();

diff --git a/lib/transaction.c b/lib/transaction.c
index 3b32801..6547e9d 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -976,7 +976,7 @@ static rpmRC _rpmtsRollback(rpmts rollbackTransaction)
            /* Make sure the filename is still there.  XXX: Can't happen */
            key = rpmteKey(te);
            if(key) {
-               rpmlog(RPMLOG_NOTICE, _("\tRemoving %s:\n"), key);
+               rpmlog(RPMLOG_NOTICE, _("\tRemoving %s:\n"), (const char*)key);
                (void) unlink(key); /* XXX: Should check for an error? */
            }
            break;

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 5b1aa88..bfba640 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -1144,7 +1144,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
        if (rc > 0) {
            rpmlog(RPMLOG_ERR,
                _("error(%d) getting \"%s\" records from %s index\n"),
-               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
        }
 
 if (rc == 0)
@@ -1269,7 +1269,7 @@ key->size = strlen(name);
     } else {                   /* error */
        rpmlog(RPMLOG_ERR,
                _("error(%d) getting \"%s\" records from %s index\n"),
-               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
        rc = -1;
     }
 
@@ -1319,7 +1319,7 @@ key->size = strlen(name);
     } else {                   /* error */
        rpmlog(RPMLOG_ERR,
                _("error(%d) getting \"%s\" records from %s index\n"),
-               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
        return RPMRC_FAIL;
     }
 
@@ -2223,7 +2223,7 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi, int fpNum)
        if (rc != DB_NOTFOUND)
            rpmlog(RPMLOG_ERR,
                _("error(%d) getting \"%s\" records from %s index\n"),
-               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
 #ifdef SQLITE_HACK
        xx = dbiCclose(dbi, dbcursor, 0);
        dbcursor = NULL;
@@ -2342,7 +2342,7 @@ if (key->data && key->size == 0) key->size++;     /* XXX "/" fixup. */
            if (rc > 0) {
                rpmlog(RPMLOG_ERR,
                        _("error(%d) getting \"%s\" records from %s index\n"),
-                       rc, (key->data ? key->data : "???"), rpmTagGetName(dbi->dbi_rpmtag));
+                       rc, (key->data ? (char *)key->data : "???"), rpmTagGetName(dbi->dbi_rpmtag));
            }
 
            /* Join keys need to be native endian internally. */
@@ -2632,7 +2632,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
                } else {                        /* error */
                    rpmlog(RPMLOG_ERR,
                        _("error(%d) setting \"%s\" records from %s index\n"),
-                       rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+                       rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                    ret += 1;
                    continue;
                }
@@ -2651,7 +2651,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
                    if (rc) {
                        rpmlog(RPMLOG_ERR,
                                _("error(%d) storing record \"%s\" into %s\n"),
-                               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+                               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                        ret += 1;
                    }
                    data->data = _free(data->data);
@@ -2661,7 +2661,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
                    if (rc) {
                        rpmlog(RPMLOG_ERR,
                                _("error(%d) removing record \"%s\" from %s\n"),
-                               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+                               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                        ret += 1;
                    }
                }
@@ -3037,7 +3037,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
                } else if (rc != DB_NOTFOUND) { /* error */
                    rpmlog(RPMLOG_ERR,
                        _("error(%d) getting \"%s\" records from %s index\n"),
-                       rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+                       rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                    ret += 1;
                    continue;
                }
@@ -3053,7 +3053,7 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
                if (rc) {
                    rpmlog(RPMLOG_ERR,
                                _("error(%d) storing record %s into %s\n"),
-                               rc, key->data, rpmTagGetName(dbi->dbi_rpmtag));
+                               rc, (char*)key->data, rpmTagGetName(dbi->dbi_rpmtag));
                    ret += 1;
                }
                data->data = _free(data->data);