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: 02-Aug-2008 18:49:56
Branch: HEAD Handle: 2008080216495401
Modified files:
rpm/lib depends.c package.c psm.c query.c rpmds.h rpmte.h
transaction.c
Log:
- jbj: propogate effects of rpmdb splint annotations.
Summary:
Revision Changes Path
1.413 +2 -1 rpm/lib/depends.c
2.205 +1 -2 rpm/lib/package.c
2.306 +6 -2 rpm/lib/psm.c
2.207 +2 -1 rpm/lib/query.c
2.70 +4 -2 rpm/lib/rpmds.h
2.52 +2 -1 rpm/lib/rpmte.h
1.383 +2 -1 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.412 -r1.413 depends.c
--- rpm/lib/depends.c 2 Aug 2008 00:38:04 -0000 1.412
+++ rpm/lib/depends.c 2 Aug 2008 16:49:54 -0000 1.413
@@ -144,7 +144,8 @@
* @return 1 if headers are identical, 0 otherwise
*/
static int rpmHeadersIdentical(Header first, Header second)
- /[EMAIL PROTECTED]/
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] internalState @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char * one, * two;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/package.c
============================================================================
$ cvs diff -u -r2.204 -r2.205 package.c
--- rpm/lib/package.c 2 Aug 2008 00:38:04 -0000 2.204
+++ rpm/lib/package.c 2 Aug 2008 16:49:54 -0000 2.205
@@ -77,12 +77,11 @@
}
/[EMAIL PROTECTED]@*/
-rpmRC rpmReadPackageFile(rpmts ts, void * _fd, const char * fn, Header *
hdrp)
+rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
HE_t she = memset(alloca(sizeof(*she)), 0, sizeof(*she));
pgpDig dig = rpmtsDig(ts);
- FD_t fd = _fd;
char buf[8*BUFSIZ];
ssize_t count;
Header sigh = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.305 -r2.306 psm.c
--- rpm/lib/psm.c 2 Aug 2008 00:38:04 -0000 2.305
+++ rpm/lib/psm.c 2 Aug 2008 16:49:54 -0000 2.306
@@ -159,7 +159,9 @@
memset(psm, 0, sizeof(*psm));
psm->ts = rpmtsLink(ts, "InstallSourcePackage");
+/[EMAIL PROTECTED]@*/ /* Avoid void * _fd annotations for now. */
rpmrc = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h);
+/[EMAIL PROTECTED]@*/
switch (rpmrc) {
case RPMRC_NOTTRUSTED:
case RPMRC_NOKEY:
@@ -1349,7 +1351,8 @@
* @return tag value (0 on failure)
*/
static rpmuint32_t hLoadTID(Header h, rpmTag tag)
- /[EMAIL PROTECTED]/
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] internalState @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmuint32_t val;
@@ -1370,7 +1373,8 @@
* @return 0 always
*/
static int hCopyTag(Header sh, Header th, rpmTag tag)
- /[EMAIL PROTECTED] th @*/
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] th, internalState @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx = 1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.206 -r2.207 query.c
--- rpm/lib/query.c 2 Aug 2008 00:38:04 -0000 2.206
+++ rpm/lib/query.c 2 Aug 2008 16:49:54 -0000 2.207
@@ -135,7 +135,8 @@
/**
*/
static inline /[EMAIL PROTECTED]@*/ const char * queryHeader(Header h, const
char * qfmt)
- /[EMAIL PROTECTED] h @*/
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] h, internalState @*/
{
const char * errstr = "(unkown error)";
const char * str;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.h
============================================================================
$ cvs diff -u -r2.69 -r2.70 rpmds.h
--- rpm/lib/rpmds.h 2 Aug 2008 00:38:04 -0000 2.69
+++ rpm/lib/rpmds.h 2 Aug 2008 16:49:55 -0000 2.70
@@ -201,7 +201,8 @@
*/
/[EMAIL PROTECTED]@*/
rpmds rpmdsThis(Header h, rpmTag tagN, evrFlags Flags)
- /[EMAIL PROTECTED]/;
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] internalState @*/;
/** \ingroup rpmds
* Create, load and initialize a dependency set of size 1.
@@ -675,7 +676,8 @@
* @return 1 if dependency overlaps, 0 otherwise
*/
int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote)
- /[EMAIL PROTECTED]/;
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] internalState @*/;
/** \ingroup rpmds
* Negate return code for negated comparisons.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.h
============================================================================
$ cvs diff -u -r2.51 -r2.52 rpmte.h
--- rpm/lib/rpmte.h 2 Aug 2008 00:38:05 -0000 2.51
+++ rpm/lib/rpmte.h 2 Aug 2008 16:49:55 -0000 2.52
@@ -639,7 +639,8 @@
* @return 0 on success
*/
int rpmteChain(rpmte p, rpmte q, Header oh, /[EMAIL PROTECTED]@*/ const char
* msg)
- /[EMAIL PROTECTED] p, q, oh @*/;
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] p, q, oh, internalState @*/;
#define RPMTE_CHAIN_END "CHAIN END" /*!< End of chain marker. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.382 -r1.383 transaction.c
--- rpm/lib/transaction.c 2 Aug 2008 00:38:05 -0000 1.382
+++ rpm/lib/transaction.c 2 Aug 2008 16:49:55 -0000 1.383
@@ -603,7 +603,8 @@
/[EMAIL PROTECTED]@*/
static int ensureOlder(rpmts ts,
const rpmte p, const Header h)
- /[EMAIL PROTECTED] ts @*/
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] ts, internalState @*/
{
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmuint32_t reqFlags = (RPMSENSE_LESS | RPMSENSE_EQUAL);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
