summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-05-03 17:44:53 +0000
committerAurelien Foret <aurelien@archlinux.org>2005-05-03 17:44:53 +0000
commitf3975acf904e3f0221a4c5ec8964008176168677 (patch)
tree4869d16ebc2feac7ddf99c5971c80e87fb77ad0e
parent54f6a1cb12c7e980eac903d4e6af4fe6e7e6b125 (diff)
downloadpacman-f3975acf904e3f0221a4c5ec8964008176168677.tar.xz
code cleanup
-rw-r--r--lib/libalpm/alpm.c4
-rw-r--r--lib/libalpm/remove.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 6c79c30b..691b478c 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -213,8 +213,8 @@ int alpm_db_unregister(pmdb_t *db)
handle->db_local = NULL;
found = 1;
} else {
- void *data;
- handle->dbs_sync = _alpm_list_remove(handle->dbs_sync, db, db_cmp, &data);
+ pmdb_t *data;
+ handle->dbs_sync = _alpm_list_remove(handle->dbs_sync, db, db_cmp, (void **)&data);
if(data) {
db_close(data);
found = 1;
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index a4fd59dd..38dfb299 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -238,7 +238,7 @@ int remove_commit(pmtrans_t *trans, pmdb_t *db)
for(lp = info->depends; lp; lp = lp->next) {
pmpkg_t *depinfo = NULL;
pmdepend_t depend;
- void *ptr;
+ char *data;
if(splitdep((char*)lp->data, &depend)) {
continue;
@@ -264,8 +264,8 @@ int remove_commit(pmtrans_t *trans, pmdb_t *db)
}
}
/* splice out this entry from requiredby */
- depinfo->requiredby = _alpm_list_remove(depinfo->requiredby, info->name, str_cmp, &ptr);
- FREE(ptr);
+ depinfo->requiredby = _alpm_list_remove(depinfo->requiredby, info->name, str_cmp, (void **)&data);
+ FREE(data);
_alpm_log(PM_LOG_DEBUG, "updating 'requiredby' field for package %s", depinfo->name);
if(db_write(db, depinfo, INFRQ_DEPENDS)) {
_alpm_log(PM_LOG_ERROR, "could not update 'requiredby' database entry %s/%s-%s", db->treename, depinfo->name, depinfo->version);