summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRalf Corsépius <corsepiu@fedoraproject.org>2007-11-26 10:42:39 +0100
committerRalf Corsépius <corsepiu@fedoraproject.org>2007-11-26 10:42:39 +0100
commit96e7f513cde29bbcec1d21f62d23b74cd1b26ed7 (patch)
treec69580d01cb36a3251b0e8a698527e83dbe45534 /lib
parentffd534e4b8893c13b4368b7c80bea873ffdadc67 (diff)
downloadlibrpm-tizen-96e7f513cde29bbcec1d21f62d23b74cd1b26ed7.tar.gz
librpm-tizen-96e7f513cde29bbcec1d21f62d23b74cd1b26ed7.tar.bz2
librpm-tizen-96e7f513cde29bbcec1d21f62d23b74cd1b26ed7.zip
Eliminate type "byte"
Diffstat (limited to 'lib')
-rw-r--r--lib/formats.c2
-rw-r--r--lib/rpmrc.c2
-rw-r--r--lib/signature.c16
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/formats.c b/lib/formats.c
index 40cfc8a45..d1773cfb3 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 = (byte *) data;
+ unsigned char * pkt = (uint8_t *) data;
unsigned int pktlen = 0;
unsigned int v = *pkt;
pgpTag tag = 0;
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index fcb9c77cb..aa78519c1 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -698,7 +698,7 @@ static int doReadRC( FD_t fd, const char * urlfn)
static int rpmPlatform(const char * platform)
{
char *cpu = NULL, *vendor = NULL, *os = NULL, *gnu = NULL;
- byte * b = NULL;
+ uint8_t * b = NULL;
ssize_t blen = 0;
int init_platform = 0;
char * p, * pe;
diff --git a/lib/signature.c b/lib/signature.c
index 4f83e8bde..5cd1ba304 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -307,7 +307,7 @@ exit:
int rpmWriteSignature(FD_t fd, Header sigh)
{
- static byte buf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+ static uint8_t buf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
int sigSize, pad;
int rc;
@@ -346,7 +346,7 @@ Header rpmFreeSignature(Header sigh)
* @return 0 on success, 1 on failure
*/
static int makePGPSignature(const char * file, int32_t * sigTagp,
- byte ** pktp, int32_t * pktlenp,
+ uint8_t ** pktp, int32_t * pktlenp,
const char * passPhrase)
{
char * sigfile = alloca(1024);
@@ -477,7 +477,7 @@ static int makePGPSignature(const char * file, int32_t * sigTagp,
* @return 0 on success, 1 on failure
*/
static int makeGPGSignature(const char * file, int32_t * sigTagp,
- byte ** pktp, int32_t * pktlenp,
+ uint8_t ** pktp, int32_t * pktlenp,
const char * passPhrase)
{
char * sigfile = alloca(strlen(file)+sizeof(".sig"));
@@ -616,7 +616,7 @@ static int makeHDRSignature(Header sigh, const char * file, int32_t sigTag,
{
Header h = NULL;
FD_t fd = NULL;
- byte * pkt;
+ uint8_t * pkt;
int32_t pktlen;
const char * fn = NULL;
const char * SHA1 = NULL;
@@ -717,7 +717,7 @@ int rpmAddSignature(Header sigh, const char * file, int32_t sigTag,
const char * passPhrase)
{
struct stat st;
- byte * pkt;
+ uint8_t * pkt;
int32_t pktlen;
int ret = -1; /* assume failure. */
@@ -966,7 +966,7 @@ verifyMD5Signature(const rpmts ts, char * t,
int32_t siglen = rpmtsSiglen(ts);
pgpDig dig = rpmtsDig(ts);
rpmRC res;
- byte * md5sum = NULL;
+ uint8_t * md5sum = NULL;
size_t md5len = 0;
*t = '\0';
@@ -1178,7 +1178,7 @@ verifyRSASignature(rpmts ts, char * t,
#ifdef NOTYET /* XXX not for binary/text signatures as in packages. */
if (!(sigp->sigtype == PGPSIGTYPE_BINARY || sigp->sigtype == PGP_SIGTYPE_TEXT)) {
int nb = dig->nbytes + sigp->hashlen;
- byte trailer[6];
+ uint8_t trailer[6];
nb = htonl(nb);
trailer[0] = 0x4;
trailer[1] = 0xff;
@@ -1278,7 +1278,7 @@ verifyDSASignature(rpmts ts, char * t,
if (sigp->version == 4) {
int nb = sigp->hashlen;
- byte trailer[6];
+ uint8_t trailer[6];
nb = htonl(nb);
trailer[0] = sigp->version;
trailer[1] = 0xff;