RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Bernhard Rosenkraenzer
Root: /v/rpm/cvs Email: b...@rpm5.org
Module: rpm Date: 27-Jan-2010 18:14:04
Branch: HEAD Handle: 2010012717140301
Modified files:
rpm CHANGES
rpm/lib rpm4compat.h
Log:
Adapt rpm4compat.h to some recent changes (rpmmiFilenum removal etc)
Summary:
Revision Changes Path
1.3260 +1 -0 rpm/CHANGES
2.30 +3 -7 rpm/lib/rpm4compat.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3259 -r1.3260 CHANGES
--- rpm/CHANGES 26 Jan 2010 23:40:35 -0000 1.3259
+++ rpm/CHANGES 27 Jan 2010 17:14:03 -0000 1.3260
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - bero: rpm4compat.h: Adjust to changes in the rest of rpm5
- jbj: rpmdb: refactor dbiSync as internal per-table, eliminate
rpmdbSync.
- jbj: rpmbf: fix: return -1 error on NULL pointers.
- jbj: gpsee: finish refactoring gsr -> rpmjs.c.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpm4compat.h
============================================================================
$ cvs diff -u -r2.29 -r2.30 rpm4compat.h
--- rpm/lib/rpm4compat.h 12 Dec 2009 20:16:48 -0000 2.29
+++ rpm/lib/rpm4compat.h 27 Jan 2010 17:14:04 -0000 2.30
@@ -1,7 +1,7 @@
/*
* Copyright © 2008 Per Øyvind Karlsen <peroyv...@mandriva.org>
*
- * $Id: rpm4compat.h,v 2.29 2009/12/12 20:16:48 jbj Exp $
+ * $Id: rpm4compat.h,v 2.30 2010/01/27 17:14:04 bero Exp $
*/
#ifndef H_RPM4COMPAT
@@ -356,21 +356,17 @@
return rpmmiInstance(mi);
}
-static inline unsigned int rpmdbGetIteratorFileNum(rpmdbMatchIterator mi) {
- return rpmmiFilenum(mi);
-}
-
static inline int rpmdbGetIteratorCount(rpmdbMatchIterator mi) {
return rpmmiCount(mi);
}
static inline int rpmdbAppendIterator(rpmdbMatchIterator mi,
- const int * hdrNums, int nHdrNums) {
+ const uint32_t * hdrNums, int nHdrNums) {
return rpmmiGrow(mi, hdrNums, nHdrNums);
}
static inline int rpmdbPruneIterator(rpmdbMatchIterator mi,
- int * hdrNums, int nHdrNums, int sorted) {
+ uint32_t * hdrNums, int nHdrNums, int sorted) {
return rpmmiPrune(mi, hdrNums, nHdrNums, sorted);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
