folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Splint fiddles. 

CVS patchset: 7437
CVS date: 2004/10/09 18:07:24
This commit is contained in:
jbj 2004-10-09 18:07:24 +00:00
parent c15266f569
commit f4545b773c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/psm.c
View File

@ -2169,7 +2169,7 @@ assert(psm->mi == NULL);
* score entry.
*/
rpmMessage(RPMMESS_DEBUG,
_("Attempting to mark %s as installed in score board(%p).\n"),
_("Attempting to mark %s as installed in score board(%u).\n"),
rpmteN(psm->te), (unsigned) score);
se = rpmtsScoreGetEntry(score, rpmteN(psm->te));
if (se != NULL) se->installed = 1;

5
lib/rpmfi.c
View File

@ -653,7 +653,8 @@ const char *const rpmfiTypeString(rpmfi fi)
static
Header relocateFileList(const rpmts ts, rpmfi fi,
Header origH, fileAction * actions)
/*@modifies ts, fi, origH, actions @*/
/*@globals h_errno, rpmGlobalMacroContext @*/
/*@modifies ts, fi, origH, actions, rpmGlobalMacroContext @*/
{
rpmte p = rpmtsRelocateElement(ts);
HGE_t hge = fi->hge;
@ -884,7 +885,7 @@ assert(fn != NULL); /* XXX can't happen */
if (fColors != NULL) {
/* XXX pkgs may not have unique dirNames, so color all dirNames that match. */
for (j = 0; j < dirCount; j++) {
if (strcmp(dirNames[dirIndexes[i]], dirNames[j])) continue;
if (strcmp(dirNames[dirIndexes[i]], dirNames[j])) /*@innercontinue@*/ continue;
dColors[j] |= fColors[i];
}
}

4
lib/signature.c
View File

@ -1214,7 +1214,7 @@ verifyPGPSignature(rpmts ts, /*@out@*/ char * t,
tt = stpcpy(tt, prefix);
tt = stpcpy(tt, dig->md5);
mpnzero(&dig->rsahm); mpnsethex(&dig->rsahm, hexstr);
mpnzero(&dig->rsahm); (void) mpnsethex(&dig->rsahm, hexstr);
hexstr = _free(hexstr);
@ -1313,7 +1313,7 @@ verifyGPGSignature(rpmts ts, /*@out@*/ char * t,
xx = rpmDigestFinal(ctx, (void **)&dig->sha1, &dig->sha1len, 1);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DIGEST), sigp->hashlen);
mpnzero(&dig->hm); mpnsethex(&dig->hm, dig->sha1);
mpnzero(&dig->hm); (void) mpnsethex(&dig->hm, dig->sha1);
/* Compare leading 16 bits of digest for quick check. */
signhash16[0] = (*dig->hm.data >> 24) & 0xff;