RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 13-Sep-2010 00:23:56
Branch: HEAD Handle: 2010091222235600
Modified files:
rpm/rpmdb db3.c
Log:
- isolate sunrpc code w test for DB_RPCCLIENT.
Summary:
Revision Changes Path
1.154 +11 -8 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.153 -r1.154 db3.c
--- rpm/rpmdb/db3.c 17 Jul 2010 19:56:48 -0000 1.153
+++ rpm/rpmdb/db3.c 12 Sep 2010 22:23:56 -0000 1.154
@@ -32,10 +32,6 @@
extern int logio_dispatch(DB_ENV * dbenv, DBT * dbt, DB_LSN * lsn, db_recops op)
/*@*/;
-#if !defined(DB_CLIENT) /* XXX db-4.2.42 retrofit */
-#define DB_CLIENT DB_RPCCLIENT
-#endif
-
#define DBIDEBUG(_dbi, _list) if ((_dbi)->dbi_debug) fprintf _list
/*@access rpmdb @*/
@@ -780,8 +776,10 @@
dbhome, dbfile, prDbiOpenFlags(eflags, 1));
/* XXX Can't do RPC w/o host. */
+#if defined(DB_RPCCLIENT)
if (dbi->dbi_host == NULL)
- dbi->dbi_ecflags &= ~DB_CLIENT;
+ dbi->dbi_ecflags &= ~DB_RPCCLIENT;
+#endif
rc = db_env_create(&dbenv, dbi->dbi_ecflags);
rc = cvtdberr(dbi, "db_env_create", rc, _debug);
@@ -809,7 +807,8 @@
/* dbenv->set_paniccall(???) */
- if ((dbi->dbi_ecflags & DB_CLIENT) && dbi->dbi_host) {
+#if defined(DB_RPCCLIENT)
+ if ((dbi->dbi_ecflags & DB_RPCCLIENT) && dbi->dbi_host) {
const char * home;
int retry = 0;
@@ -825,7 +824,9 @@
break;
(void) sleep(15);
}
- } else {
+ } else
+#endif
+ {
{ size_t _lo = 16 * 1024 * 1024;
size_t _hi = 512 * 1024 * 1024;
@@ -2475,7 +2476,9 @@
* glibc/kernel combinations.
*/
if (rc == 0 && dbi->dbi_lockdbfd &&
- !((dbi->dbi_ecflags & DB_CLIENT) && dbi->dbi_host) &&
+#if defined(DB_RPCCLIENT)
+ !((dbi->dbi_ecflags & DB_RPCCLIENT) && dbi->dbi_host) &&
+#endif
(!dbi->dbi_use_dbenv || _lockdbfd++ == 0))
{
int fdno = -1;
@@ .
Received on Mon Sep 13 00:23:56 2010