RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Feb-2008 19:37:18
Branch: HEAD Handle: 2008021718371700
Modified files:
rpm/rpmdb legacy.c rpmdb.c signature.c sqlite.c
Log:
- jbj: splint: annotate recent changes.
Summary:
Revision Changes Path
1.38 +3 -0 rpm/rpmdb/legacy.c
1.237 +43 -37 rpm/rpmdb/rpmdb.c
1.45 +3 -3 rpm/rpmdb/signature.c
1.27 +8 -2 rpm/rpmdb/sqlite.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/legacy.c
============================================================================
$ cvs diff -u -r1.37 -r1.38 legacy.c
--- rpm/rpmdb/legacy.c 27 Nov 2007 02:29:27 -0000 1.37
+++ rpm/rpmdb/legacy.c 17 Feb 2008 18:37:17 -0000 1.38
@@ -14,6 +14,9 @@
# undef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 32
#endif
+#if defined(__LCLINT__)
+typedef long long loff_t;
+#endif
#include <gelf.h>
#if !defined(DT_GNU_PRELINKED)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.236 -r1.237 rpmdb.c
--- rpm/rpmdb/rpmdb.c 10 Feb 2008 18:32:33 -0000 1.236
+++ rpm/rpmdb/rpmdb.c 17 Feb 2008 18:37:17 -0000 1.237
@@ -38,6 +38,12 @@
#include "debug.h"
+#if defined(__LCLINT__)
+#define UINT32_T u_int32_t
+#else
+#define UINT32_T uint32_t
+#endif
+
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
@@ -546,7 +552,7 @@
return -1;
_dbbyteswapped = dbiByteSwapped(dbi);
- data->size = (uint32_t)(set->count * (dbi->dbi_jlen));
+ data->size = (UINT32_T)(set->count * (dbi->dbi_jlen));
if (data->size == 0) {
data->data = NULL;
return 0;
@@ -1457,7 +1463,7 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) baseName;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) strlen(baseName);
+key->size = (UINT32_T) strlen(baseName);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1586,7 +1592,7 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) name;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) strlen(name);
+key->size = (UINT32_T) strlen(name);
xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1653,7 +1659,7 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) name;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) strlen(name);
+key->size = (UINT32_T) strlen(name);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -1860,11 +1866,11 @@
(void) headerGetMagic(mi->mi_h, NULL, &nb);
/[EMAIL PROTECTED]@*/ key->data = (void *) &mi->mi_prevoffset;
- key->size = (uint32_t) sizeof(mi->mi_prevoffset);
+ key->size = (UINT32_T) sizeof(mi->mi_prevoffset);
{ size_t len;
len = 0;
data->data = headerUnload(mi->mi_h, &len);
- data->size = (uint32_t) len; /* XXX data->size is uint32_t */
+ data->size = (UINT32_T) len; /* XXX data->size is uint32_t */
#ifdef DYING /* XXX this is needed iff headerSizeof() is used
instead. */
data->size -= nb; /* XXX HEADER_MAGIC_NO */
#endif
@@ -2358,9 +2364,9 @@
keylen = sizeof(mi_offset.ui);
} else {
key->data = (void *)mi->mi_keyp;
- key->size = (uint32_t) mi->mi_keylen;
+ key->size = (UINT32_T) mi->mi_keylen;
data->data = uh;
- data->size = (uint32_t) uhlen;
+ data->size = (UINT32_T) uhlen;
#if !defined(_USE_COPY_LOAD)
data->flags |= DB_DBT_MALLOC;
#endif
@@ -2404,7 +2410,7 @@
/* Retrieve next header blob for index iterator. */
if (uh == NULL) {
key->data = keyp;
- key->size = (uint32_t) keylen;
+ key->size = (UINT32_T) keylen;
#if !defined(_USE_COPY_LOAD)
data->flags |= DB_DBT_MALLOC;
#endif
@@ -2714,8 +2720,8 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) keyp;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) keylen;
-if (key->data && key->size == 0) key->size = (uint32_t) strlen((char
*)key->data);
+key->size = (UINT32_T) keylen;
+if (key->data && key->size == 0) key->size = (UINT32_T) strlen((char
*)key->data);
if (key->data && key->size == 0) key->size++; /* XXX "/" fixup. */
/[EMAIL PROTECTED]@*/
@@ -2889,7 +2895,7 @@
_DBSWAP(mi_offset);
key->data = &mi_offset;
/[EMAIL PROTECTED]@*/
- key->size = (uint32_t) sizeof(mi_offset.ui);
+ key->size = (UINT32_T) sizeof(mi_offset.ui);
rc = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
@@ -2949,23 +2955,23 @@
stringvalued = 0;
switch (he->t) {
case RPM_UINT8_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui8p);
+ key->size = (UINT32_T) sizeof(*he->p.ui8p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui8p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT16_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui16p);
+ key->size = (UINT32_T) sizeof(*he->p.ui16p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui16p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT32_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui32p);
+ key->size = (UINT32_T) sizeof(*he->p.ui32p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui32p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT64_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui64p);
+ key->size = (UINT32_T) sizeof(*he->p.ui64p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui64p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_BIN_TYPE:
- key->size = (uint32_t) he->c;
+ key->size = (UINT32_T) he->c;
/[EMAIL PROTECTED]@*/ key->data = he->p.ptr;
he->c = 1; /* XXX break out of loop. */
/[EMAIL PROTECTED]@*/ break;
@@ -2988,7 +2994,7 @@
*t = (uint8_t) (nibble(s[0]) << 4) | nibble(s[1]);
/[EMAIL PROTECTED]@*/
key->data = bin;
- key->size = (uint32_t) dlen;
+ key->size = (UINT32_T) dlen;
/[EMAIL PROTECTED]@*/ break;
}
/* Extract the pubkey id from the base64 blob. */
@@ -2999,13 +3005,13 @@
if (nbin <= 0)
/[EMAIL PROTECTED]@*/ continue;
key->data = bin;
- key->size = (uint32_t) nbin;
+ key->size = (UINT32_T) nbin;
/[EMAIL PROTECTED]@*/ break;
}
/[EMAIL PROTECTED]@*/
default:
/[EMAIL PROTECTED]@*/ key->data = (void *) he->p.argv[i];
- key->size = (uint32_t) strlen(he->p.argv[i]);
+ key->size = (UINT32_T) strlen(he->p.argv[i]);
stringvalued = 1;
/[EMAIL PROTECTED]@*/ break;
}
@@ -3034,7 +3040,7 @@
set = NULL;
-if (key->size == 0) key->size = (uint32_t) strlen((char *)key->data);
+if (key->size == 0) key->size = (UINT32_T) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
/[EMAIL PROTECTED]@*/
@@ -3205,9 +3211,9 @@
/[EMAIL PROTECTED]@*/
key->data = keyp;
- key->size = (uint32_t) keylen;
+ key->size = (UINT32_T) keylen;
/[EMAIL PROTECTED]@*/ data->data = datap;
- data->size = (uint32_t) datalen;
+ data->size = (UINT32_T) datalen;
ret = dbiGet(dbi, dbcursor, key, data, DB_SET);
keyp = key->data;
keylen = key->size;
@@ -3234,11 +3240,11 @@
}
key->data = keyp;
- key->size = (uint32_t) keylen;
+ key->size = (UINT32_T) keylen;
/[EMAIL PROTECTED]@*/
data->data = datap;
/[EMAIL PROTECTED]@*/
- data->size = (uint32_t) datalen;
+ data->size = (UINT32_T) datalen;
/[EMAIL PROTECTED]@*/
ret = dbiPut(dbi, dbcursor, key, data, DB_KEYLAST);
@@ -3305,13 +3311,13 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) &mi_offset;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) sizeof(mi_offset.ui);
+key->size = (UINT32_T) sizeof(mi_offset.ui);
{ size_t len;
nb = 0;
(void) headerGetMagic(h, NULL, &nb);
len = 0;
data->data = headerUnload(h, &len);
- data->size = (uint32_t) len; /* XXX data->size is uint32_t */
+ data->size = (UINT32_T) len; /* XXX data->size is uint32_t */
#ifdef DYING /* XXX this is needed iff headerSizeof() is used
instead. */
data->size -= nb; /* XXX HEADER_MAGIC_NO */
#endif
@@ -3434,23 +3440,23 @@
stringvalued = 0;
switch (he->t) {
case RPM_UINT8_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui8p);
+ key->size = (UINT32_T) sizeof(*he->p.ui8p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui8p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT16_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui16p);
+ key->size = (UINT32_T) sizeof(*he->p.ui16p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui16p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT32_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui32p);
+ key->size = (UINT32_T) sizeof(*he->p.ui32p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui32p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT64_TYPE:
- key->size = (uint32_t) sizeof(*he->p.ui64p);
+ key->size = (UINT32_T) sizeof(*he->p.ui64p);
/[EMAIL PROTECTED]@*/ key->data = he->p.ui64p + i;
/[EMAIL PROTECTED]@*/ break;
case RPM_BIN_TYPE:
- key->size = (uint32_t) he->c;
+ key->size = (UINT32_T) he->c;
/[EMAIL PROTECTED]@*/ key->data = he->p.ptr;
he->c = 1; /* XXX break out of loop. */
/[EMAIL PROTECTED]@*/ break;
@@ -3473,7 +3479,7 @@
*t = (uint8_t) (nibble(s[0]) << 4) | nibble(s[1]);
/[EMAIL PROTECTED]@*/
key->data = bin;
- key->size = (uint32_t) dlen;
+ key->size = (UINT32_T) dlen;
/[EMAIL PROTECTED]@*/ break;
}
/* Extract the pubkey id from the base64 blob. */
@@ -3484,13 +3490,13 @@
if (nbin <= 0)
/[EMAIL PROTECTED]@*/ continue;
key->data = bin;
- key->size = (uint32_t) nbin;
+ key->size = (UINT32_T) nbin;
/[EMAIL PROTECTED]@*/ break;
}
/[EMAIL PROTECTED]@*/
default:
/[EMAIL PROTECTED]@*/ key->data = (void *) he->p.argv[i];
- key->size = (uint32_t) strlen(he->p.argv[i]);
+ key->size = (UINT32_T) strlen(he->p.argv[i]);
stringvalued = 1;
/[EMAIL PROTECTED]@*/ break;
}
@@ -3512,7 +3518,7 @@
set = NULL;
-if (key->size == 0) key->size = (uint32_t) strlen((char *)key->data);
+if (key->size == 0) key->size = (UINT32_T) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
/[EMAIL PROTECTED]@*/
@@ -3613,7 +3619,7 @@
/[EMAIL PROTECTED]@*/
key->data = (void *) fpList[i].baseName;
/[EMAIL PROTECTED]@*/
-key->size = (uint32_t) strlen((char *)key->data);
+key->size = (UINT32_T) strlen((char *)key->data);
if (key->size == 0) key->size++; /* XXX "/" fixup. */
tag = (_db_tagged_file_indices ? taghash(fpList[i].entry->dirName) : 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.44 -r1.45 signature.c
--- rpm/rpmdb/signature.c 9 Feb 2008 15:41:53 -0000 1.44
+++ rpm/rpmdb/signature.c 17 Feb 2008 18:37:17 -0000 1.45
@@ -413,7 +413,7 @@
if (makeGPGSignature(fn, &sigTag, &pkt, &pktlen, passPhrase))
goto exit;
- he->tag = sigTag;
+ he->tag = (rpmTag) sigTag;
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
@@ -453,7 +453,7 @@
if (Stat(file, &st) != 0)
break;
pktlen = st.st_size;
- he->tag = sigTag;
+ he->tag = (rpmTag) sigTag;
he->t = RPM_UINT32_TYPE;
he->p.ui32p = &pktlen;
he->c = 1;
@@ -469,7 +469,7 @@
pkt = memset(alloca(pktlen), 0, pktlen);
if (dodigest(PGPHASHALGO_MD5, file, (unsigned char *)pkt, 0, NULL))
break;
- he->tag = sigTag;
+ he->tag = (rpmTag) sigTag;
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.26 -r1.27 sqlite.c
--- rpm/rpmdb/sqlite.c 28 Jan 2008 20:29:16 -0000 1.26
+++ rpm/rpmdb/sqlite.c 17 Feb 2008 18:37:17 -0000 1.27
@@ -48,6 +48,12 @@
#include "debug.h"
+#if defined(__LCLINT__)
+#define UINT32_T u_int32_t
+#else
+#define UINT32_T uint32_t
+#endif
+
/[EMAIL PROTECTED] rpmdb @*/
/[EMAIL PROTECTED] dbiIndex @*/
@@ -1195,7 +1201,7 @@
scp->keys = xcalloc(scp->nkeys, sizeof(*scp->keys));
for (ix = 0; ix < scp->nkeys; ix++) {
scp->keys[ix] = xmalloc(sizeof(*scp->keys[0]));
- scp->keys[ix]->size = (uint32_t) scp->avlen[ix+1];
+ scp->keys[ix]->size = (UINT32_T) scp->avlen[ix+1];
scp->keys[ix]->data = xmalloc(scp->keys[ix]->size);
memcpy(scp->keys[ix]->data, scp->av[ix+1], scp->avlen[ix+1]);
}
@@ -1274,7 +1280,7 @@
scp->ldata = _free(scp->ldata);
}
- data->size = (uint32_t) scp->avlen[1];
+ data->size = (UINT32_T) scp->avlen[1];
data->data = xmalloc(data->size);
if (! (data->flags & DB_DBT_MALLOC) )
scp->ldata = data->data;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
