diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-02-14 13:10:51 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-02-14 13:10:51 +0200 |
| commit | 9f8aa63490ac5091e77b9f2b7427f58a299a0eb4 (patch) | |
| tree | 32b3acf479d5b5073e048c6a3c403a5895dabdf7 /rpmdb | |
| parent | f214356fe570cae0086886377d4ea8241d26d96a (diff) | |
| download | rpm-9f8aa63490ac5091e77b9f2b7427f58a299a0eb4.tar.gz rpm-9f8aa63490ac5091e77b9f2b7427f58a299a0eb4.tar.bz2 rpm-9f8aa63490ac5091e77b9f2b7427f58a299a0eb4.zip | |
Fix a bunch of string format mismatches found by gcc's variadic checks
Patch from Michal Marek
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/rpmdb.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 5b1aa889e..bfba6400e 100644 --- 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); |