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: 19-Aug-2009 19:33:48
Branch: HEAD Handle: 2009081917334800
Modified files:
rpm/rpmdb dbconfig.c librpmdb.vers rpmdb.h
Log:
- replace db3Free with a #define, remove from ABI.
Summary:
Revision Changes Path
1.58 +0 -7 rpm/rpmdb/dbconfig.c
1.69 +0 -1 rpm/rpmdb/librpmdb.vers
1.93 +5 -2 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/dbconfig.c
============================================================================
$ cvs diff -u -r1.57 -r1.58 dbconfig.c
--- rpm/rpmdb/dbconfig.c 24 May 2009 20:50:54 -0000 1.57
+++ rpm/rpmdb/dbconfig.c 19 Aug 2009 17:33:48 -0000 1.58
@@ -636,13 +636,6 @@
};
/*...@=compmempass =immediatetrans =exportlocal =exportheadervar =t...@*/
-dbiIndex db3Free(dbiIndex dbi)
-{
- if (dbi != NULL)
- (void)rpmioFreePoolItem((rpmioItem)dbi, __FUNCTION__, __FILE__,
__LINE__);
- return NULL;
-}
-
static void dbiFini(void * _dbi)
/*...@modifies _dbi @*/
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/librpmdb.vers
============================================================================
$ cvs diff -u -r1.68 -r1.69 librpmdb.vers
--- rpm/rpmdb/librpmdb.vers 1 Jun 2009 20:35:02 -0000 1.68
+++ rpm/rpmdb/librpmdb.vers 19 Aug 2009 17:33:48 -0000 1.69
@@ -4,7 +4,6 @@
_dbi_debug;
_dbiPool;
db3dbi;
- db3Free;
db3New;
db3vec;
dbiFreeIndexSet;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.92 -r1.93 rpmdb.h
--- rpm/rpmdb/rpmdb.h 29 May 2009 22:11:36 -0000 1.92
+++ rpm/rpmdb/rpmdb.h 19 Aug 2009 17:33:48 -0000 1.93
@@ -510,8 +510,11 @@
* @return NULL always
*/
/*...@null@*/
-dbiIndex db3Free( /*...@only@*/ /*...@null@*/ dbiIndex dbi)
- /*...@*/;
+dbiIndex db3Free(/*...@only@*/ /*...@null@*/ dbiIndex dbi)
+ /*...@globals fileSystem, internalState @*/
+ /*...@modifies dbi, fileSystem, internalState @*/;
+#define db3Free(_dbi) \
+ ((dbiIndex)rpmioFreePoolItem((rpmioItem)(_dbi), __FUNCTION__, __FILE__,
__LINE__))
/** \ingroup db3
* Format db3 open flags for debugging print.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
