1 files changed, 40 insertions, 43 deletions

diff --git a/lib/install.h b/lib/install.h
index af7d966b5..1ae43209f 100644
--- a/lib/install.h
+++ b/lib/install.h
@@ -26,54 +26,67 @@ struct sharedFileInfo {
 
 /**
  */
-enum fileActions { FA_UNKNOWN = 0, FA_CREATE, FA_BACKUP, FA_SAVE, FA_SKIP, 
-		   FA_ALTNAME, FA_REMOVE, FA_SKIPNSTATE, FA_SKIPNETSHARED,
-		   FA_SKIPMULTILIB };
+enum fileActions {
+    FA_UNKNOWN = 0,
+    FA_CREATE,
+    FA_BACKUP,
+    FA_SAVE,
+    FA_SKIP, 
+    FA_ALTNAME,
+    FA_REMOVE,
+    FA_SKIPNSTATE,
+    FA_SKIPNETSHARED,
+    FA_SKIPMULTILIB
+};
 
 /**
  */
-enum fileTypes { XDIR, BDEV, CDEV, SOCK, PIPE, REG, LINK } ;
+enum fileTypes {
+    XDIR,
+    BDEV,
+    CDEV,
+    SOCK,
+    PIPE,
+    REG,
+    LINK
+};
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * @param prefix	path to top of install tree
+ * @param ts		transaction set
  * @param h		header
  * @param scriptTag
  * @param progTag
  * @param arg
  * @param norunScripts
- * @param err		stderr file handle
  */
-int runInstScript(const char * prefix, Header h, int scriptTag, int progTag,
-		int arg, int norunScripts, FD_t err);
+int runInstScript(const rpmTransactionSet ts, Header h,
+		int scriptTag, int progTag, int arg, int norunScripts);
 
 /**
  * Run trigger scripts in the database that are fired by header.
- * @param root		path to top of install tree
- * @param rpmdb		rpm database
- * @param sense
+ * @param ts		transaction set
+ * @param sense		@todo Document.
  * @param h		header
- * @param countCorrection
- * @param scriptFd
+ * @param countCorrection	@todo Document.
+ * @return		0 on success, 1 on error
  */
-int runTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
-		int countCorrection, FD_t scriptFd);
+int runTriggers(const rpmTransactionSet ts, int sense, Header h,
+		int countCorrection);
 
 /**
  * Run triggers from header that are fired by the database.
- * @param root		path to top of install tree
- * @param rpmdb		rpm database
+ * @param ts		transaction set
  * @param sense		@todo Document.
  * @param h		header
  * @param countCorrection	@todo Document.
- * @param scriptFd	@todo Document.
- * @return		@todo Document.
+ * @return		0 on success, 1 on error
  */
-int runImmedTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
-		int countCorrection, FD_t scriptFd);
+int runImmedTriggers(const rpmTransactionSet ts, int sense, Header h,
+		int countCorrection);
 
 /**
  * Return formatted string representation of file disposition.
@@ -84,45 +97,29 @@ int runImmedTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
 
 /**
  * Install binary package (from transaction set).
- * @param rootdir	path to top of install tree
- * @param rpmdb		rpm database
+ * @param ts		transaction set
  * @param fd		package file handle
  * @param h		package header
- * @param transFlags	transaction flags
- * @param notify	progress callback
- * @param notifyData	progress callback private data
  * @param pkgKey	package private data
  * @param actions	array of file dispositions
  * @param sharedList	header instances of packages that share files
- * @param scriptFd	@todo Document.
  * @return		0 on success, 1 on bad magic, 2 on error
  */
-int installBinaryPackage(const char * rootdir, rpmdb rpmdb, FD_t fd, Header h,
-		rpmtransFlags transFlags,
-		rpmCallbackFunction notify, rpmCallbackData notifyData,
+int installBinaryPackage(const rpmTransactionSet ts, FD_t fd, Header h,
 		const void * pkgKey, enum fileActions * actions,
-		struct sharedFileInfo * sharedList, FD_t scriptFd);
+		struct sharedFileInfo * sharedList);
 
 /**
  * Erase binary package (from transaction set).
- * @param rootdir	path to top of install tree
- * @param rpmdb		rpm database
- * @param fd		package file handle
+ * @param ts		transaction set
  * @param offset	header instance in rpm database
  * @param h		package header
- * @param transFlags	transaction flags
- * @param notify	progress callback
- * @param notifyData	progress callback private data
  * @param pkgKey	package private data
  * @param actions	array of file dispositions
- * @param scriptFd	@todo Document.
  * @return
  */
-int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
-		Header h, rpmtransFlags flags,
-		rpmCallbackFunction notify, rpmCallbackData notifyData,
-		const void * pkgKey, enum fileActions * actions,
-		FD_t scriptFd);
+int removeBinaryPackage(const rpmTransactionSet ts, unsigned int offset,
+		Header h, const void * pkgKey, enum fileActions * actions);
 
 #ifdef __cplusplus
 }