Shred a pile of BDB config goo that's never been actually implemented

- with the exception subfile (used by now extinct sqlite backend)
  none of this was ever even connected to the bdb configuration...

diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c
index 749605c..8425f28 100644 (file)
--- a/lib/backend/dbconfig.c
+++ b/lib/backend/dbconfig.c
@@ -86,8 +86,6 @@ static const struct poptOption rdbOptions[] = {
 
  { "file",     0,POPT_ARG_STRING,      &staticdbi.dbi_file, 0,
        NULL, NULL },
- { "subfile",  0,POPT_ARG_STRING,      &staticdbi.dbi_subfile, 0,
-       NULL, NULL },
  { "mode",     0,POPT_ARG_INT,         &staticdbi.dbi_mode, 0,
        NULL, NULL },
  { "perms",    0,POPT_ARG_INT,         &staticdbi.dbi_perms, 0,
@@ -109,17 +107,9 @@ static const struct poptOption rdbOptions[] = {
        NULL, NULL },
  { "temporary",        0,POPT_ARG_NONE,        &staticdbi.dbi_temporary, 0,
        NULL, NULL },
- { "debug",    0,POPT_ARG_NONE,        &staticdbi.dbi_debug, 0,
-       NULL, NULL },
 
  { "cachesize",        0,POPT_ARG_INT,         &staticdbi.dbi_cachesize, 0,
        NULL, NULL },
- { "errpfx",   0,POPT_ARG_STRING,      &staticdbi.dbi_errpfx, 0,
-       NULL, NULL },
- { "region_init", 0,POPT_ARG_VAL,      &staticdbi.dbi_region_init, 1,
-       NULL, NULL },
- { "tas_spins",        0,POPT_ARG_INT,         &staticdbi.dbi_tas_spins, 0,
-       NULL, NULL },
 
 #if defined(DB_VERB_CHKPOINT)
  { "chkpoint", 0,POPT_BIT_SET, &staticdbi.dbi_verbose, DB_VERB_CHKPOINT,
@@ -134,25 +124,6 @@ static const struct poptOption rdbOptions[] = {
  { "verbose",  0,POPT_ARG_VAL,         &staticdbi.dbi_verbose, -1,
        NULL, NULL },
 
- { "lk_oldest",        0,POPT_ARG_VAL,         &staticdbi.dbi_lk_detect, DB_LOCK_OLDEST,
-       NULL, NULL },
- { "lk_random",        0,POPT_ARG_VAL,         &staticdbi.dbi_lk_detect, DB_LOCK_RANDOM,
-       NULL, NULL },
- { "lk_youngest",0, POPT_ARG_VAL,      &staticdbi.dbi_lk_detect, DB_LOCK_YOUNGEST,
-       NULL, NULL },
-/* XXX lk_conflicts matrix */
- { "lk_max",   0,POPT_ARG_INT,         &staticdbi.dbi_lk_max, 0,
-       NULL, NULL },
-
- { "lg_bsize", 0,POPT_ARG_INT,         &staticdbi.dbi_lg_bsize, 0,
-       NULL, NULL },
- { "lg_max",   0,POPT_ARG_INT,         &staticdbi.dbi_lg_max, 0,
-       NULL, NULL },
-
-/* XXX tx_recover */
- { "tx_max",   0,POPT_ARG_INT,         &staticdbi.dbi_tx_max, 0,
-       NULL, NULL },
-
  { "lorder",   0,POPT_ARG_INT,         &staticdbi.dbi_lorder, 0,
        NULL, NULL },
 
@@ -210,9 +181,7 @@ dbiIndex dbiFree(dbiIndex dbi)
 {
     if (dbi) {
        dbi->dbi_file = _free(dbi->dbi_file);
-       dbi->dbi_subfile = _free(dbi->dbi_subfile);
        dbi->dbi_tmpdir = _free(dbi->dbi_tmpdir);
-       dbi->dbi_errpfx = _free(dbi->dbi_errpfx);
        dbi->dbi_re_source = _free(dbi->dbi_re_source);
        dbi->dbi_stats = _free(dbi->dbi_stats);
        dbi = _free(dbi);

diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h
index 997f0d6..e1b886f 100644 (file)
--- a/lib/rpmdb_internal.h
+++ b/lib/rpmdb_internal.h
@@ -46,7 +46,6 @@ struct _dbiIndexSet {
  */
 struct _dbiIndex {
     char * dbi_file;           /*!< file component of path */
-    char * dbi_subfile;
     char * dbi_tmpdir;         /*!< temporary directory */
 
     int        dbi_ecflags;            /*!< db_env_create flags */
@@ -68,7 +67,6 @@ struct _dbiIndex {
     int        dbi_no_dbsync;          /*!< don't call dbiSync */
     int        dbi_lockdbfd;           /*!< do fcntl lock on db fd */
     int        dbi_temporary;          /*!< non-persistent */
-    int        dbi_debug;
     int        dbi_byteswapped;
 
        /* dbenv parameters */
@@ -76,27 +74,10 @@ struct _dbiIndex {
     /* XXX db-4.3.14 adds dbenv as 1st arg. */
     void (*db_errcall) (void * dbenv, const char *db_errpfx, char *buffer);
     FILE *     dbi_errfile;
-    char * dbi_errpfx;
     int        dbi_verbose;
-    int        dbi_region_init;
-    int        dbi_tas_spins;
        /* mpool sub-system parameters */
     int        dbi_mmapsize;   /*!< (10Mb) */
     int        dbi_cachesize;  /*!< (128Kb) */
-       /* lock sub-system parameters */
-    unsigned int dbi_lk_max;
-    unsigned int dbi_lk_detect;
-int dbi_lk_nmodes;
-unsigned char * dbi_lk_conflicts;
-       /* log sub-system parameters */
-    unsigned int dbi_lg_max;
-    unsigned int dbi_lg_bsize;
-       /* transaction sub-system parameters */
-    unsigned int dbi_tx_max;
-#if 0
-    int        (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec,
-                               DB_LSN *lsnp, int redo, void *info);
-#endif
        /* dbinfo parameters */
     int        dbi_pagesize;           /*!< (fs blksize) */
        /* hash access parameters */