Bury the old cursor api one foot deeper

- Make it static and move doxygen bits to the new API, adjust as necessary

diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 41c550d..b948025 100644 (file)
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -233,7 +233,7 @@ int dbiSync(dbiIndex dbi, unsigned int flags)
     return rc;
 }
 
-int dbiCclose(dbiIndex dbi, DBC * dbcursor,
+static int dbiCclose(dbiIndex dbi, DBC * dbcursor,
                unsigned int flags)
 {
     int rc = -2;
@@ -246,7 +246,7 @@ int dbiCclose(dbiIndex dbi, DBC * dbcursor,
     return rc;
 }
 
-int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int dbiflags)
+static int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int dbiflags)
 {
     DB * db = dbi->dbi_db;
     DBC * dbcursor = NULL;
@@ -275,7 +275,7 @@ int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int dbiflags)
 }
 
 /* Store (key,data) pair in index database. */
-int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
+static int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
                unsigned int flags)
 {
     int rc = EINVAL;
@@ -294,7 +294,7 @@ int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
     return rc;
 }
 
-int dbiDel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
+static int dbiDel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
           unsigned int flags)
 {
     int rc = EINVAL;
@@ -322,7 +322,7 @@ int dbiDel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
 }
 
 /* Retrieve (key,data) pair from index database. */
-int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
+static int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
                unsigned int flags)
 {
     int rc = EINVAL;
@@ -345,7 +345,7 @@ int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
     return rc;
 }
 
-int dbiCount(dbiIndex dbi, DBC * dbcursor,
+static int dbiCount(dbiIndex dbi, DBC * dbcursor,
             unsigned int * countp,
             unsigned int flags)
 {

diff --git a/lib/backend/dbi.h b/lib/backend/dbi.h
index 249a35f..50b9751 100644 (file)
--- a/lib/backend/dbi.h
+++ b/lib/backend/dbi.h
@@ -132,79 +132,6 @@ char * prDbiOpenFlags(int dbflags, int print_dbenv_flags);
 RPM_GNUC_INTERNAL
 int dbiOpen(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags);
 
-
-/* FIX: vector annotations */
-/** \ingroup dbi
- * Open a database cursor.
- * @param dbi          index database handle
- * @retval dbcp                returned database cursor
- * @param flags                DB_WRITECURSOR if writing, or 0
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiCopen(dbiIndex dbi, DBC ** dbcp, unsigned int flags);
-
-/** \ingroup dbi
- * Close a database cursor.
- * @param dbi          index database handle
- * @param dbcursor     database cursor
- * @param flags                (unused)
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiCclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags);
-
-/** \ingroup dbi
- * Delete (key,data) pair(s) from index database.
- * @param dbi          index database handle
- * @param dbcursor     database cursor (NULL will use db->del)
- * @param key          delete key value/length/flags
- * @param data         delete data value/length/flags
- * @param flags                (unused)
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiDel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
-          unsigned int flags);
-
-/** \ingroup dbi
- * Retrieve (key,data) pair from index database.
- * @param dbi          index database handle
- * @param dbcursor     database cursor (NULL will use db->get)
- * @param key          retrieve key value/length/flags
- * @param data         retrieve data value/length/flags
- * @param flags                (unused)
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
-          unsigned int flags);
-
-/** \ingroup dbi
- * Store (key,data) pair in index database.
- * @param dbi          index database handle
- * @param dbcursor     database cursor (NULL will use db->put)
- * @param key          store key value/length/flags
- * @param data         store data value/length/flags
- * @param flags                (unused)
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
-          unsigned int flags);
-
-/** \ingroup dbi
- * Retrieve count of (possible) duplicate items.
- * @param dbi          index database handle
- * @param dbcursor     database cursor
- * @param countp       address of count
- * @param flags                (unused)
- * @return             0 on success
- */
-RPM_GNUC_INTERNAL
-int dbiCount(dbiIndex dbi, DBC * dbcursor, unsigned int * countp,
-            unsigned int flags);
-
 /** \ingroup dbi
  * Close index database.
  * @param dbi          index database handle
@@ -264,21 +191,61 @@ int dbiFlags(dbiIndex dbi);
 RPM_GNUC_INTERNAL
 const char * dbiName(dbiIndex dbi);
 
+/** \ingroup dbi
+ * Open a database cursor.
+ * @param dbi          index database handle
+ * @param flags                DB_WRITECURSOR if writing, or 0
+ * @return             database cursor handle
+ */
 RPM_GNUC_INTERNAL
 dbiCursor dbiCursorInit(dbiIndex dbi, unsigned int flags);
 
+/** \ingroup dbi
+ * Destroy a database cursor handle
+ * @param dbc          database cursor handle
+ * @return             NULL always
+ */
 RPM_GNUC_INTERNAL
 dbiCursor dbiCursorFree(dbiCursor dbc);
 
+/** \ingroup dbi
+ * Store (key,data) pair in index database.
+ * @param dbcursor     database cursor handle
+ * @param key          store key value/length/flags
+ * @param data         store data value/length/flags
+ * @param flags                flags
+ * @return             0 on success
+ */
 RPM_GNUC_INTERNAL
 int dbiCursorPut(dbiCursor dbc, DBT * key, DBT * data, unsigned int flags);
 
+/** \ingroup dbi
+ * Retrieve (key,data) pair from index database.
+ * @param dbc          database cursor handle
+ * @param key          retrieve key value/length/flags
+ * @param data         retrieve data value/length/flags
+ * @param flags                flags
+ * @return             0 on success
+ */
 RPM_GNUC_INTERNAL
 int dbiCursorGet(dbiCursor dbc, DBT * key, DBT * data, unsigned int flags);
 
+/** \ingroup dbi
+ * Delete (key,data) pair(s) from index database.
+ * @param dbc          database cursor handle
+ * @param key          delete key value/length/flags
+ * @param data         delete data value/length/flags
+ * @param flags                flags
+ * @return             0 on success
+ */
 RPM_GNUC_INTERNAL
 int dbiCursorDel(dbiCursor dbc, DBT * key, DBT * data, unsigned int flags);
 
+/** \ingroup dbi
+ * Retrieve count of (possible) duplicate items.
+ * @param dbcursor     database cursor
+ * @return             number of duplicates
+ */
 RPM_GNUC_INTERNAL
 unsigned int dbiCursorCount(dbiCursor dbc);