From 81754356cd3b7118e32665b6306369ba2cdc1c35 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 7 Apr 2010 12:43:20 +0300
Subject: [PATCH] Make rpmdbAdd() and rpmdbRemove() internal-only - all
 additions and removals to the rpmdb need to go through the   transaction
 machinery, these are very low-level functions that   API users have no
 business messing with

---
 lib/psm.c            |  1 +
 lib/rpmdb.h          | 16 ----------------
 lib/rpmdb_internal.h | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/psm.c b/lib/psm.c
index 20444ca..525b1f4 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -21,6 +21,7 @@
 #include "lib/fsm.h"		/* XXX CPIO_FOO/FSM_FOO constants */
 #include "lib/rpmfi_internal.h" /* XXX replaced/states... */
 #include "lib/rpmte_internal.h"	/* XXX internal apis */
+#include "lib/rpmdb_internal.h" /* rpmdbAdd/Remove */
 #include "lib/rpmscript.h"
 
 #include "debug.h"
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 489bd4b..dc21184 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -234,22 +234,6 @@ int rpmdbCheckTerminate(int terminate);
 rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi);
 
 /** \ingroup rpmdb
- * Add package header to rpm database and indices.
- * @param db		rpm database
- * @param h		header
- * @return		0 on success
- */
-int rpmdbAdd(rpmdb db, Header h);
-
-/** \ingroup rpmdb
- * Remove package header from rpm database and indices.
- * @param db		rpm database
- * @param h		header
- * @return		0 on success
- */
-int rpmdbRemove(rpmdb db, Header h);
-
-/** \ingroup rpmdb
  * Rebuild database indices from package headers.
  * @param prefix	path to top of install tree
  * @param ts		transaction set (or NULL)
diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h
index 6c9ec7b..1f7be34 100644
--- a/lib/rpmdb_internal.h
+++ b/lib/rpmdb_internal.h
@@ -14,6 +14,24 @@ extern "C" {
 #endif
 
 /** \ingroup rpmdb
+ * Add package header to rpm database and indices.
+ * @param db		rpm database
+ * @param h		header
+ * @return		0 on success
+ */
+RPM_GNUC_INTERNAL
+int rpmdbAdd(rpmdb db, Header h);
+
+/** \ingroup rpmdb
+ * Remove package header from rpm database and indices.
+ * @param db		rpm database
+ * @param h		header
+ * @return		0 on success
+ */
+RPM_GNUC_INTERNAL
+int rpmdbRemove(rpmdb db, Header h);
+
+/** \ingroup rpmdb
  * Return rpmdb home directory (depending on chroot state)
  * param db		rpmdb handle
  * return		db home directory (or NULL on error)
-- 
2.7.4