RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Nov-2009 01:19:31
Branch: HEAD Handle: 2009111700193000
Modified files:
rpm/rpmdb hdrfmt.c rpmdb.c rpmdb.h
Log:
- rpmmi: rpmmiPrune: change instance array to uint32_t * to reflect
reality.
Summary:
Revision Changes Path
1.144 +2 -2 rpm/rpmdb/hdrfmt.c
1.342 +1 -1 rpm/rpmdb/rpmdb.c
1.126 +1 -1 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.143 -r1.144 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 2 Oct 2009 16:05:17 -0000 1.143
+++ rpm/rpmdb/hdrfmt.c 17 Nov 2009 00:19:30 -0000 1.144
@@ -2695,7 +2695,7 @@
mi = rpmmiInit(_rpmdb, tagN, key, keylen);
if (hitp && *hitp)
- xx = rpmmiPrune(mi, (int *)argiData(*hitp), argiCount(*hitp), 0);
+ xx = rpmmiPrune(mi, (uint32_t *)argiData(*hitp), argiCount(*hitp), 0);
while ((oh = rpmmiNext(mi)) != NULL) {
if (!headerGet(oh, RNhe, 0))
goto bottom;
@@ -2872,7 +2872,7 @@
mi = rpmmiInit(_rpmdb, tagN, key, keylen);
if (hitp && *hitp)
- xx = rpmmiPrune(mi, (int *)argiData(*hitp), argiCount(*hitp), 0);
+ xx = rpmmiPrune(mi, (uint32_t *)argiData(*hitp), argiCount(*hitp), 0);
while ((oh = rpmmiNext(mi)) != NULL) {
if (!headerGet(oh, PNhe, 0))
goto bottom;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.341 -r1.342 rpmdb.c
--- rpm/rpmdb/rpmdb.c 15 Nov 2009 16:33:48 -0000 1.341
+++ rpm/rpmdb/rpmdb.c 17 Nov 2009 00:19:30 -0000 1.342
@@ -2505,7 +2505,7 @@
}
/* XXX TODO: a Bloom Filter on removed packages created once, not each time.
*/
-int rpmmiPrune(rpmmi mi, int * hdrNums, int nHdrNums, int sorted)
+int rpmmiPrune(rpmmi mi, uint32_t * hdrNums, int nHdrNums, int sorted)
{
int rc = (mi == NULL || hdrNums == NULL || nHdrNums <= 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.125 -r1.126 rpmdb.h
--- rpm/rpmdb/rpmdb.h 14 Nov 2009 16:22:49 -0000 1.125
+++ rpm/rpmdb/rpmdb.h 17 Nov 2009 00:19:30 -0000 1.126
@@ -1674,7 +1674,7 @@
* @return 0 on success, 1 on failure (bad args)
*/
int rpmmiPrune(/*...@null@*/ rpmmi mi,
- /*...@null@*/ int * hdrNums, int nHdrNums, int sorted)
+ /*...@null@*/ uint32_t * hdrNums, int nHdrNums, int sorted)
/*...@modifies mi, hdrNums @*/;
/** \ingroup rpmdb
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
