summaryrefslogtreecommitdiff
path: root/src/solvable.c
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2008-09-17 10:30:59 +0000
committerMichael Schroeder <mls@suse.de>2008-09-17 10:30:59 +0000
commitb3821d1bc8464c377aaff644a0e00b3f09e463aa (patch)
tree9e847d928b4aa9d848338740903ee1389872afd0 /src/solvable.c
parenteeb5fad132b310b50d04f408d84c9474c30bd287 (diff)
downloadlibsolv-b3821d1bc8464c377aaff644a0e00b3f09e463aa.tar.gz
libsolv-b3821d1bc8464c377aaff644a0e00b3f09e463aa.tar.bz2
libsolv-b3821d1bc8464c377aaff644a0e00b3f09e463aa.zip
- Change provide iterator from ID pointer to ID. Before, iterating
was unsave as the whatprovides array can get relocated.
Diffstat (limited to 'src/solvable.c')
-rw-r--r--src/solvable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/solvable.c b/src/solvable.c
index 2ca310c..f595f1c 100644
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -397,7 +397,7 @@ static inline Id dep2name(Pool *pool, Id dep)
static inline int providedbyinstalled(Pool *pool, Map *installed, Id dep)
{
- Id p, *pp;
+ Id p, pp;
FOR_PROVIDES(p, pp, dep)
{
if (p == SYSTEMSOLVABLE)
@@ -429,7 +429,7 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
{
Pool *pool = s->repo->pool;
Solvable *s2;
- Id p, *pp, *dp;
+ Id p, pp, *dp;
Id *reqp, req;
Id *conp, con;
Id *obsp, obs;
@@ -503,7 +503,7 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
conp = s2->repo->idarraydata + s2->conflicts;
while ((con = *conp++) != 0)
{
- dp = pool_whatprovides(pool, con);
+ dp = pool->whatprovidesdata + pool_whatprovides(pool, con);
for (; *dp; dp++)
if (*dp == p)
return 0;
@@ -597,7 +597,7 @@ pool_create_state_maps(Pool *pool, Queue *installed, Map *installedmap, Map *con
conp = s->repo->idarraydata + s->conflicts;
while ((con = *conp++) != 0)
{
- dp = pool_whatprovides(pool, con);
+ dp = pool->whatprovidesdata + pool_whatprovides(pool, con);
for (; *dp; dp++)
MAPSET(conflictsmap, *dp);
}