[pacman-dev] [PATCH 09/13] Require handle for alpm_find_grp_pkgs()

Dan McGee dan at archlinux.org
Tue Jun 7 17:36:38 EDT 2011


Signed-off-by: Dan McGee <dan at archlinux.org>
---
 lib/libalpm/alpm.h |    3 ++-
 lib/libalpm/sync.c |    5 +++--
 src/pacman/sync.c  |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 821f2fa..c493245 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -634,7 +634,8 @@ off_t alpm_delta_get_size(pmdelta_t *delta);
  */
 const char *alpm_grp_get_name(const pmgrp_t *grp);
 alpm_list_t *alpm_grp_get_pkgs(const pmgrp_t *grp);
-alpm_list_t *alpm_find_grp_pkgs(alpm_list_t *dbs, const char *name);
+alpm_list_t *alpm_find_grp_pkgs(pmhandle_t *handle, alpm_list_t *dbs,
+		const char *name);
 
 /*
  * Sync
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index b4ac077..b525efa 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -205,11 +205,12 @@ int SYMEXPORT alpm_sync_sysupgrade(pmhandle_t *handle, int enable_downgrade)
 /** Find group members across a list of databases.
  * If a member exists in several databases, only the first database is used.
  * IgnorePkg is also handled.
+ * @param handle the context handle
  * @param dbs the list of pmdb_t *
- * @pram name the name of the group
+ * @param name the name of the group
  * @return the list of pmpkg_t * (caller is responsible for alpm_list_free)
  */
-alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(alpm_list_t *dbs,
+alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(pmhandle_t *handle, alpm_list_t *dbs,
 		const char *name)
 {
 	alpm_list_t *i, *j, *pkgs = NULL, *ignorelist = NULL;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index cf350d7..87b321f 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -641,7 +641,7 @@ static int process_group(alpm_list_t *dbs, char *group)
 {
 	int ret = 0;
 	alpm_list_t *i;
-	alpm_list_t *pkgs = alpm_find_grp_pkgs(dbs, group);
+	alpm_list_t *pkgs = alpm_find_grp_pkgs(config->handle, dbs, group);
 	int count = alpm_list_count(pkgs);
 
 	if(!count) {
-- 
1.7.5.2



More information about the pacman-dev mailing list