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: 25-May-2009 01:30:28
Branch: HEAD Handle: 2009052423302700
Modified files:
rpm CHANGES
rpm/rpmdb header_internal.h librpmdb.vers rpmdb.h
Log:
- pick-up some orphan check-ins.
- header: remove (unused) headerUsageCount.
Summary:
Revision Changes Path
1.2997 +2 -0 rpm/CHANGES
1.54 +0 -19 rpm/rpmdb/header_internal.h
1.67 +3 -1 rpm/rpmdb/librpmdb.vers
1.91 +1 -0 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2996 -r1.2997 CHANGES
--- rpm/CHANGES 24 May 2009 22:48:44 -0000 1.2996
+++ rpm/CHANGES 24 May 2009 23:30:27 -0000 1.2997
@@ -1,5 +1,7 @@
5.2b1 -> 5.3a1
+ - jbj: pick-up some orphan check-ins.
+ - jbj: header: remove (unused) headerUsageCount.
- jbj: header: fix: re-initialize headers from pool more carefully.
- jbj: rpmps: fix: remove the hack-o-round, handle rpmps like other
pools.
- jbj: yarn: convert dbiIndex to usage mutex with refcounts.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header_internal.h
============================================================================
$ cvs diff -u -r1.53 -r1.54 header_internal.h
--- rpm/rpmdb/header_internal.h 18 May 2009 02:12:40 -0000 1.53
+++ rpm/rpmdb/header_internal.h 24 May 2009 23:30:27 -0000 1.54
@@ -136,25 +136,6 @@
int headerVerifyInfo(rpmuint32_t il, rpmuint32_t dl, const void * pev, void
* iv, int negate)
/*...@modifies *iv @*/;
-/** \ingroup header
- * Return header reference count.
- * @param h header
- * @return no. of references
- */
-/*...@-type@*/ /* FIX: cast? */
-/*...@unused@*/ static inline
-int headerUsageCount(Header h)
- /*...@globals fileSystem, internalState @*/
- /*...@modifies fileSystem, internalState @*/
-{
- int nrefs = 0;
- yarnPossess(h->_item.use);
- nrefs = (int)yarnPeekLock(h->_item.use);
- yarnRelease(h->_item.use);
- return nrefs;
-}
-/*...@=type@*/
-
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/librpmdb.vers
============================================================================
$ cvs diff -u -r1.66 -r1.67 librpmdb.vers
--- rpm/rpmdb/librpmdb.vers 20 May 2009 17:50:55 -0000 1.66
+++ rpm/rpmdb/librpmdb.vers 24 May 2009 23:30:27 -0000 1.67
@@ -1,7 +1,8 @@
LIBRPMDB_0
{
global:
- _rpmdb_debug;
+ _dbi_debug;
+ _dbiPool;
db3dbi;
db3Free;
db3New;
@@ -85,6 +86,7 @@
rpmAddSignature;
rpmCheckPassPhrase;
rpmDatabasePoptTable;
+ _rpmdb_debug;
_rpmdbPool;
rpmdbAdd;
rpmDBArgs;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.90 -r1.91 rpmdb.h
--- rpm/rpmdb/rpmdb.h 15 May 2009 23:48:48 -0000 1.90
+++ rpm/rpmdb/rpmdb.h 24 May 2009 23:30:27 -0000 1.91
@@ -271,6 +271,7 @@
* Describes an index database (implemented on Berkeley db3 functionality).
*/
struct _dbiIndex {
+ struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
/*...@relnull@*/
const char * dbi_root; /*!< chroot(2) component of path */
/*...@null@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
