Require handle argument to alpm_logaction()

This is the first in a series of patches to update the API to remove the
implicit global handle variable.

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 4a025742..4ac3b56b 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -176,7 +176,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			}
 			break;
 		case PM_TRANS_EVT_ADD_DONE:
-			alpm_logaction("installed %s (%s)\n",
+			alpm_logaction(config->handle, "installed %s (%s)\n",
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			display_optdepends(data1);
@@ -187,7 +187,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			}
 			break;
 		case PM_TRANS_EVT_REMOVE_DONE:
-			alpm_logaction("removed %s (%s)\n",
+			alpm_logaction(config->handle, "removed %s (%s)\n",
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			break;
@@ -197,7 +197,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			}
 			break;
 		case PM_TRANS_EVT_UPGRADE_DONE:
-			alpm_logaction("upgraded %s (%s -> %s)\n",
+			alpm_logaction(config->handle, "upgraded %s (%s -> %s)\n",
 			         (char *)alpm_pkg_get_name(data1),
 			         (char *)alpm_pkg_get_version(data2),
 			         (char *)alpm_pkg_get_version(data1));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 4b54eb34..544a26fe 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -735,7 +735,7 @@ static void cl_to_log(int argc, char* argv[])
 		*p++ = ' ';
 	}
 	strcpy(p, argv[i]);
-	alpm_logaction("Running '%s'\n", cl_text);
+	alpm_logaction(config->handle, "Running '%s'\n", cl_text);
 	free(cl_text);
 }
 
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 884504f3..ffc30ce5 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -757,7 +757,7 @@ static int sync_trans(alpm_list_t *targets)
 
 	if(config->op_s_upgrade) {
 		printf(_(":: Starting full system upgrade...\n"));
-		alpm_logaction("starting full system upgrade\n");
+		alpm_logaction(config->handle, "starting full system upgrade\n");
 		if(alpm_sync_sysupgrade(config->op_s_upgrade >= 2) == -1) {
 			pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast());
 			retval = 1;
@@ -919,7 +919,7 @@ int pacman_sync(alpm_list_t *targets)
 	if(config->op_s_sync) {
 		/* grab a fresh package list */
 		printf(_(":: Synchronizing package databases...\n"));
-		alpm_logaction("synchronizing package lists\n");
+		alpm_logaction(config->handle, "synchronizing package lists\n");
 		if(!sync_synctree(config->op_s_sync, sync_dbs)) {
 			return 1;
 		}