Prepare to move contents to rpmdb.c/rpmdb.h

CVS patchset: 3681
CVS date: 2000/04/18 17:22:37

diff --git a/lib/dbindex.c b/lib/dbindex.c
index b16e4d6..ecde6fd 100644 (file)
--- a/lib/dbindex.c
+++ b/lib/dbindex.c
@@ -44,19 +44,6 @@ unsigned int dbiIndexSetCount(dbiIndexSet set) {
     return set->count;
 }
 
-#ifdef DYING
-dbiIndexRecord dbiReturnIndexRecordInstance(unsigned int recOffset, unsigned int fileNumber) {
-    dbiIndexRecord rec = xmalloc(sizeof(*rec));
-    rec->recOffset = recOffset;
-    rec->fileNumber = fileNumber;
-    return rec;
-}
-
-void dbiFreeIndexRecordInstance(dbiIndexRecord rec) {
-    if (rec) free(rec);
-}
-#endif
-
 unsigned int dbiIndexRecordOffset(dbiIndexSet set, int recno) {
     return set->recs[recno].recOffset;
 }
@@ -171,122 +158,9 @@ int dbiCloseIndex(dbiIndex dbi) {
     return rc;
 }
 
-#ifdef DYING
-int dbiSyncIndex(dbiIndex dbi) {
-    int rc;
-
-    rc = (*dbi->dbi_vec->sync) (dbi, 0);
-    return rc;
-}
-
-int dbiGetNextKey(dbiIndex dbi, void ** keyp, size_t * keylenp) {
-    int rc;
-
-    if (dbi == NULL)
-       return 1;
-
-    rc = (*dbi->dbi_vec->cget) (dbi, keyp, keylenp, NULL, NULL);
-
-    return rc;
-}
-
-int dbiFreeCursor(dbiIndex dbi) {
-    int rc;
-
-    if (dbi == NULL)
-       return 1;
-
-    rc = (*dbi->dbi_vec->cclose) (dbi);
-    return rc;
-}
-
-int dbiSearchIndex(dbiIndex dbi, const char * str, size_t len,
-               dbiIndexSet * set)
-{
-    int rc;
-
-    rc = (*dbi->dbi_vec->SearchIndex) (dbi, str, len, set);
-
-    switch (rc) {
-    case -1:
-       rpmError(RPMERR_DBGETINDEX, _("error getting record %s from %s"),
-               str, dbi->dbi_file);
-       break;
-    }
-    return rc;
-}
-
-int dbiUpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set) {
-    int rc;
-
-    rc = (*dbi->dbi_vec->UpdateIndex) (dbi, str, set);
-
-    if (set->count) {
-       if (rc) {
-           rpmError(RPMERR_DBPUTINDEX, _("error storing record %s into %s"),
-                   str, dbi->dbi_file);
-       }
-    } else {
-       if (rc) {
-           rpmError(RPMERR_DBPUTINDEX, _("error removing record %s into %s"),
-                   str, dbi->dbi_file);
-       }
-    }
-
-    return rc;
-}
-
-int dbiAppendIndexRecord(dbiIndexSet set, dbiIndexRecord rec)
-{
-    set->count++;
-
-    if (set->count == 1) {
-       set->recs = xmalloc(set->count * sizeof(*(set->recs)));
-    } else {
-       set->recs = xrealloc(set->recs, set->count * sizeof(*(set->recs)));
-    }
-    set->recs[set->count - 1].recOffset = rec->recOffset;
-    set->recs[set->count - 1].fileNumber = rec->fileNumber;
-
-    return 0;
-}
-#endif
-
-dbiIndexSet dbiCreateIndexSet(void) {
-    dbiIndexSet set = xmalloc(sizeof(*set));
-
-    set->recs = NULL;
-    set->count = 0;
-    return set;
-}
-
 void dbiFreeIndexSet(dbiIndexSet set) {
     if (set) {
        if (set->recs) free(set->recs);
        free(set);
     }
 }
-
-#ifdef DYING
-/* returns 1 on failure */
-int dbiRemoveIndexRecord(dbiIndexSet set, dbiIndexRecord rec) {
-    int from;
-    int to = 0;
-    int num = set->count;
-    int numCopied = 0;
-
-    for (from = 0; from < num; from++) {
-       if (rec->recOffset != set->recs[from].recOffset ||
-           rec->fileNumber != set->recs[from].fileNumber) {
-           /* structure assignment */
-           if (from != to) set->recs[to] = set->recs[from];
-           to++;
-           numCopied++;
-       } else {
-           set->count--;
-       }
-    }
-
-    return (numCopied == num);
-}
-#endif

diff --git a/lib/dbindex.h b/lib/dbindex.h
index c8f948d..0df4d04 100644 (file)
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -147,22 +147,23 @@ struct _dbiVec {
  * Describes an index database (implemented on Berkeley db[123] API).
  */
 struct _dbiIndex {
-    const char * dbi_basename;         /*<! last component of name */
-    int dbi_rpmtag;                    /*<! rpm tag used for index */
+    const char *dbi_basename;          /*<! last component of name */
+    int                dbi_rpmtag;             /*<! rpm tag used for index */
 
-    DBI_TYPE dbi_type;                 /*<! type of access */
-    int dbi_flags;                     /*<! flags to use on open */
-    int dbi_perms;                     /*<! file permission to use on open */
-    int dbi_major;                     /*<! Berkeley db version major */
+    DBI_TYPE   dbi_type;               /*<! type of access */
+    int                dbi_flags;              /*<! flags to use on open */
+    int                dbi_perms;              /*<! file permission to use on open */
+    int                dbi_major;              /*<! Berkeley db version major */
     unsigned int dbi_lastoffset;       /*<! db0 with falloc.c needs this */
-
-    const char * dbi_file;             /*<! name of index database */
-    void * dbi_db;                     /*<! Berkeley db[123] handle */
-    void * dbi_dbenv;
-    void * dbi_dbinfo;
-    void * dbi_dbjoin;
-    void * dbi_dbcursor;
-    void * dbi_pkgs;
+    rpmdb      dbi_rpmdb;
+
+    const char *dbi_file;              /*<! name of index database */
+    void *     dbi_db;                 /*<! Berkeley db[123] handle */
+    void *     dbi_dbenv;
+    void *     dbi_dbinfo;
+    void *     dbi_dbjoin;
+    void *     dbi_dbcursor;
+    void *     dbi_pkgs;
 /*@observer@*/ const struct _dbiVec * dbi_vec; /*<! private methods */
 };
 
@@ -186,86 +187,6 @@ extern "C" {
  */
 int dbiCloseIndex( /*@only@*/ dbiIndex dbi);
 
-#ifdef DYING
-/**
- * Flush pending operations to disk.
- * @param dbi  index database handle
- */
-int dbiSyncIndex(dbiIndex dbi);
-
-/**
- * Return items that match criteria.
- * @param dbi  index database handle
- * @param str  search key
- * @param set  items retrieved from index database
- * @return     -1 error, 0 success, 1 not found
- */
-int dbiSearchIndex(dbiIndex dbi, const char * str, size_t len, /*@out@*/ dbiIndexSet * set);
-
-/**
- * Change/delete items that match criteria.
- * @param dbi  index database handle
- * @param str  update key
- * @param set  items to update in index database
- * @return     0 success, 1 not found
- */
-int dbiUpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set);
-
-/**
- * Append element to set of index database items.
- * @param set  set of index database items
- * @param rec  item to append to set
- * @return     0 success (always)
- */
-int dbiAppendIndexRecord( /*@out@*/ dbiIndexSet set, dbiIndexRecord rec);
-#endif
-
-/**
- * Create empty set of index database items.
- * @return     empty set of index database items
- */
-/*@only@*/ dbiIndexSet dbiCreateIndexSet(void);
-
-#ifdef DYING
-/**
- * Remove element from set of index database items.
- * @param set  set of index database items
- * @param rec  item to remove from set
- * @return     0 success, 1 failure
- */
-int dbiRemoveIndexRecord(dbiIndexSet set, dbiIndexRecord rec);
-
-/**
- * Return next index database key.
- * @param dbi  index database handle
- * @param keyp address of first key
- * @param keylenp address of first key size
- * @return     0 success - fails if rec is not found
- */
-int dbiGetNextKey(dbiIndex dbi, /*@out@*/ void ** keyp, size_t * keylenp);
-
-/**
- * Close cursor (if any);
- * @param dbi  index database handle
- * @return     0 success
- */
-int dbiFreeCursor(dbiIndex dbi);
-
-/**
- * Create and initialize element of index database set.
- * @param recOffset    byte offset of header in db
- * @param fileNumber   file array index
- * @return     new element
- */
-/*@only@*/ dbiIndexRecord dbiReturnIndexRecordInstance(unsigned int recOffset,
-               unsigned int fileNumber);
-/**
- * Destroy element of index database set.
- * @param rec  element of index database set.
- */
-void dbiFreeIndexRecordInstance( /*@only@*/ dbiIndexRecord rec);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/lookup.c b/lib/lookup.c
index ed0a1f2..606f357 100644 (file)
--- a/lib/lookup.c
+++ b/lib/lookup.c
@@ -2,7 +2,7 @@
 
 #include <rpmlib.h>
 
-#include "dbindex.h"   /* XXX prototypes */
+#include "rpmdb.h"     /* XXX prototypes */
 #include "lookup.h"
 
 /* XXX used in transaction.c */