From f4545b773ce594f3fdeaaf1c03685ecdeb669984 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Sat, 9 Oct 2004 18:07:24 +0000
Subject: [PATCH] Splint fiddles.

CVS patchset: 7437
CVS date: 2004/10/09 18:07:24
---
 lib/psm.c       | 2 +-
 lib/rpmfi.c     | 5 +++--
 lib/signature.c | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/psm.c b/lib/psm.c
index da52f21..65db4db 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -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;
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 6909648..7a79765 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -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];
 }
 }
diff --git a/lib/signature.c b/lib/signature.c
index ba5fb06..ef6e768 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -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;
-- 
2.7.4