Implement dbiGet and dbiPut as normal function

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index f1f51d2..2b07ace 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -307,6 +307,30 @@ exit:
     return dbi;
 }
 
+/* Retrieve (key,data) pair from index database. */
+int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
+               unsigned int flags)
+{
+    int rc;
+    assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
+    (void) rpmswEnter(&dbi->dbi_rpmdb->db_getops, 0);
+    rc = (dbi->dbi_vec->cget) (dbi, dbcursor, key, data, flags);
+    (void) rpmswExit(&dbi->dbi_rpmdb->db_getops, data->size);
+    return rc;
+}
+
+/* Store (key,data) pair in index database. */
+int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
+               unsigned int flags)
+{
+    int rc;
+    assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0);
+    (void) rpmswEnter(&dbi->dbi_rpmdb->db_putops, (ssize_t) 0);
+    rc = (dbi->dbi_vec->cput) (dbi, dbcursor, key, data, flags);
+    (void) rpmswExit(&dbi->dbi_rpmdb->db_putops, (ssize_t) data->size);
+    return rc;
+}
+
 /**
  * Create and initialize item for index database set.
  * @param hdrNum       header instance in db

diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h
index 2b83675..009b5a0 100644 (file)
--- a/lib/rpmdb_internal.h
+++ b/lib/rpmdb_internal.h
@@ -402,17 +402,9 @@ int dbiDel(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
  * @param flags                (unused)
  * @return             0 on success
  */
-static inline
+RPM_GNUC_INTERNAL
 int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
-               unsigned int flags)
-{
-    int rc;
-    assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
-    (void) rpmswEnter(&dbi->dbi_rpmdb->db_getops, 0);
-    rc = (dbi->dbi_vec->cget) (dbi, dbcursor, key, data, flags);
-    (void) rpmswExit(&dbi->dbi_rpmdb->db_getops, data->size);
-    return rc;
-}
+          unsigned int flags);
 
 /** \ingroup dbi
  * Store (key,data) pair in index database.
@@ -423,17 +415,9 @@ int dbiGet(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
  * @param flags                (unused)
  * @return             0 on success
  */
-static inline
+RPM_GNUC_INTERNAL
 int dbiPut(dbiIndex dbi, DBC * dbcursor, DBT * key, DBT * data,
-               unsigned int flags)
-{
-    int rc;
-    assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0);
-    (void) rpmswEnter(&dbi->dbi_rpmdb->db_putops, (ssize_t) 0);
-    rc = (dbi->dbi_vec->cput) (dbi, dbcursor, key, data, flags);
-    (void) rpmswExit(&dbi->dbi_rpmdb->db_putops, (ssize_t) data->size);
-    return rc;
-}
+          unsigned int flags);
 
 /** \ingroup dbi
  * Retrieve count of (possible) duplicate items.