[pacman-dev] [PATCH 1/3] Remove unused argument trans from function _alpm_runscriptlet

[Daniel Mendler]

Signed-off-by: Daniel Mendler <mail at daniel-mendler.de>
---
 lib/libalpm/add.c    |    8 ++++----
 lib/libalpm/remove.c |    4 ++--
 lib/libalpm/trans.c  |    2 +-
 lib/libalpm/trans.h  |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 2cfa23b..c37198c 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -517,7 +517,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current,
 		/* pre_upgrade scriptlet */
 		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
 			_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
-					"pre_upgrade", newpkg->version, oldpkg->version, trans);
+					"pre_upgrade", newpkg->version, oldpkg->version);
 		}
 	} else {
 		is_upgrade = 0;
@@ -529,7 +529,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current,
 		/* pre_install scriptlet */
 		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
 			_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
-					"pre_install", newpkg->version, NULL, trans);
+					"pre_install", newpkg->version, NULL);
 		}
 	}
 
@@ -698,10 +698,10 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current,
 		if(is_upgrade) {
 			_alpm_runscriptlet(handle->root, scriptlet, "post_upgrade",
 					alpm_pkg_get_version(newpkg),
-					oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans);
+					oldpkg ? alpm_pkg_get_version(oldpkg) : NULL);
 		} else {
 			_alpm_runscriptlet(handle->root, scriptlet, "post_install",
-					alpm_pkg_get_version(newpkg), NULL, trans);
+					alpm_pkg_get_version(newpkg), NULL);
 		}
 	}
 
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 5def92a..0641e43 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -390,7 +390,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
 		/* run the pre-remove scriptlet if it exists  */
 		if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
 			_alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
-					alpm_pkg_get_version(info), NULL, trans);
+					alpm_pkg_get_version(info), NULL);
 		}
 
 		if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
@@ -435,7 +435,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
 		/* run the post-remove script if it exists  */
 		if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
 			_alpm_runscriptlet(handle->root, scriptlet, "post_remove",
-					alpm_pkg_get_version(info), NULL, trans);
+					alpm_pkg_get_version(info), NULL);
 		}
 
 		/* remove the package from the database */
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 804ab7a..5b06505 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -339,7 +339,7 @@ static int grep(const char *fn, const char *needle)
 
 int _alpm_runscriptlet(const char *root, const char *installfn,
 											 const char *script, const char *ver,
-											 const char *oldver, pmtrans_t *trans)
+											 const char *oldver)
 {
 	char scriptfn[PATH_MAX];
 	char cmdline[PATH_MAX];
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index ce2dc52..afe0ed7 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -74,7 +74,7 @@ int _alpm_trans_init(pmtrans_t *trans, pmtransflag_t flags,
                      alpm_trans_cb_progress progress);
 int _alpm_runscriptlet(const char *root, const char *installfn,
                        const char *script, const char *ver,
-                       const char *oldver, pmtrans_t *trans);
+                       const char *oldver);
 
 #endif /* _ALPM_TRANS_H */
 
-- 
1.7.3.5