summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Corsépius <corsepiu@fedoraproject.org>2007-11-26 10:53:47 +0100
committerRalf Corsépius <corsepiu@fedoraproject.org>2007-11-26 10:53:47 +0100
commit95c55a1af9fa4be56737eefa0e709ce5abe47deb (patch)
tree8fc93b2f8ab6b29d339de98800a4670cb72ad92c
parent96e7f513cde29bbcec1d21f62d23b74cd1b26ed7 (diff)
downloadrpm-95c55a1af9fa4be56737eefa0e709ce5abe47deb.tar.gz
rpm-95c55a1af9fa4be56737eefa0e709ce5abe47deb.tar.bz2
rpm-95c55a1af9fa4be56737eefa0e709ce5abe47deb.zip
Type pedantery.
-rw-r--r--lib/formats.c2
-rw-r--r--rpmio/rpmpgp.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/formats.c b/lib/formats.c
index d1773cfb3..996c5bf4f 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -352,7 +352,7 @@ static char * pgpsigFormat(int32_t type, const void * data,
if (type != RPM_BIN_TYPE) {
val = xstrdup(_("(not a blob)"));
} else {
- unsigned char * pkt = (uint8_t *) data;
+ uint8_t * pkt = (uint8_t *) data;
unsigned int pktlen = 0;
unsigned int v = *pkt;
pgpTag tag = 0;
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 84b0198f2..1d6f515c4 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -971,10 +971,10 @@ typedef enum rpmDigestFlags_e {
* @return native-endian integer
*/
static inline
-unsigned int pgpGrab(const uint8_t *s, int nbytes)
+unsigned int pgpGrab(const uint8_t *s, size_t nbytes)
{
unsigned int i = 0;
- int nb = (nbytes <= sizeof(i) ? nbytes : sizeof(i));
+ size_t nb = (nbytes <= sizeof(i) ? nbytes : sizeof(i));
while (nb--)
i = (i << 8) | *s++;
return i;