1 files changed, 24 insertions, 23 deletions

diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index 066107d7..c6c0b98f 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -56,7 +56,7 @@ static int mount_point_cmp(const void *p1, const void *p2)
 	const alpm_mountpoint_t *mp1 = p1;
 	const alpm_mountpoint_t *mp2 = p2;
 	/* the negation will sort all mountpoints before their parent */
-	return(-strcmp(mp1->mount_dir, mp2->mount_dir));
+	return -strcmp(mp1->mount_dir, mp2->mount_dir);
 }
 
 static alpm_list_t *mount_point_list(void)
@@ -71,8 +71,8 @@ static alpm_list_t *mount_point_list(void)
 
 	fp = setmntent(MOUNTED, "r");
 
-	if (fp == NULL) {
-		return(NULL);
+	if(fp == NULL) {
+		return NULL;
 	}
 
 	while((mnt = getmntent(fp))) {
@@ -103,8 +103,8 @@ static alpm_list_t *mount_point_list(void)
 
 	entries = getmntinfo(&fsp, MNT_NOWAIT);
 
-	if (entries < 0) {
-		return(NULL);
+	if(entries < 0) {
+		return NULL;
 	}
 
 	for(; entries-- > 0; fsp++) {
@@ -128,7 +128,7 @@ static alpm_list_t *mount_point_list(void)
 		mp = ptr->data;
 		_alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir);
 	}
-	return(mount_points);
+	return mount_points;
 }
 
 static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points,
@@ -140,16 +140,16 @@ static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points,
 		alpm_mountpoint_t *data = mp->data;
 
 		if(strncmp(data->mount_dir, real_path, data->mount_dir_len) == 0) {
-			return(data);
+			return data;
 		}
 	}
 
 	/* should not get here... */
-	return(NULL);
+	return NULL;
 }
 
-static int calculate_removed_size(const alpm_list_t *mount_points,
-		pmpkg_t *pkg)
+static int calculate_removed_size(pmhandle_t *handle,
+		const alpm_list_t *mount_points, pmpkg_t *pkg)
 {
 	alpm_list_t *file;
 
@@ -182,17 +182,17 @@ static int calculate_removed_size(const alpm_list_t *mount_points,
 		mp->used |= USED_REMOVE;
 	}
 
-	return(0);
+	return 0;
 }
 
-static int calculate_installed_size(const alpm_list_t *mount_points,
-		pmpkg_t *pkg)
+static int calculate_installed_size(pmhandle_t *handle,
+		const alpm_list_t *mount_points, pmpkg_t *pkg)
 {
 	int ret=0;
 	struct archive *archive;
 	struct archive_entry *entry;
 
-	if ((archive = archive_read_new()) == NULL) {
+	if((archive = archive_read_new()) == NULL) {
 		pm_errno = PM_ERR_LIBARCHIVE;
 		ret = -1;
 		goto cleanup;
@@ -254,28 +254,29 @@ static int calculate_installed_size(const alpm_list_t *mount_points,
 	archive_read_finish(archive);
 
 cleanup:
-	return(ret);
+	return ret;
 }
 
-int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
+int _alpm_check_diskspace(pmhandle_t *handle)
 {
 	alpm_list_t *mount_points, *i;
 	alpm_mountpoint_t *root_mp;
 	size_t replaces = 0, current = 0, numtargs;
 	int abort = 0;
 	alpm_list_t *targ;
+	pmtrans_t *trans = handle->trans;
 
 	numtargs = alpm_list_count(trans->add);
 	mount_points = mount_point_list();
 	if(mount_points == NULL) {
 		_alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points\n"));
-		return(-1);
+		return -1;
 	}
 	root_mp = match_mount_point(mount_points, handle->root);
 	if(root_mp == NULL) {
 		_alpm_log(PM_LOG_ERROR, _("could not determine root mount point %s\n"),
 				handle->root);
-		return(-1);
+		return -1;
 	}
 
 	replaces = alpm_list_count(trans->remove);
@@ -288,7 +289,7 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
 					numtargs, current);
 
 			local_pkg = targ->data;
-			calculate_removed_size(mount_points, local_pkg);
+			calculate_removed_size(handle, mount_points, local_pkg);
 		}
 	}
 
@@ -300,11 +301,11 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
 
 		pkg = targ->data;
 		/* is this package already installed? */
-		local_pkg = _alpm_db_get_pkgfromcache(db_local, pkg->name);
+		local_pkg = _alpm_db_get_pkgfromcache(handle->db_local, pkg->name);
 		if(local_pkg) {
-			calculate_removed_size(mount_points, local_pkg);
+			calculate_removed_size(handle, mount_points, local_pkg);
 		}
-		calculate_installed_size(mount_points, pkg);
+		calculate_installed_size(handle, mount_points, pkg);
 
 		for(i = mount_points; i; i = alpm_list_next(i)) {
 			alpm_mountpoint_t *data = i->data;
@@ -352,7 +353,7 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
 		RET_ERR(PM_ERR_DISK_SPACE, -1);
 	}
 
-	return(0);
+	return 0;
 }
 
 /* vim: set ts=2 sw=2 noet: */