- allow repositories that don't consist of a single block of solvables

[platform/upstream/libsolv.git] / src / pool.c

diff --git a/src/pool.c b/src/pool.c
index 4ccddc4..765010a 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -1,4 +1,11 @@
 /*
+ * Copyright (c) 2007, Novell Inc.
+ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information
+ */
+
+/*
  * pool.c
  * 
  * The pool contains information about solvables
@@ -39,6 +46,7 @@ static char *initpool_data[] = {
   "solvable:name",
   "solvable:arch",
   "solvable:evr",
+  "solvable:vendor",
   "solvable:provides",
   "solvable:obsoletes",
   "solvable:conflicts",
@@ -95,6 +103,7 @@ pool_create(void)
   // pre-alloc space for a Solvable
   pool->solvables = (Solvable *)xcalloc(2, sizeof(Solvable));
   pool->nsolvables = 2;
+  queue_init(&pool->vendormap);
   s = pool->solvables + SYSTEMSOLVABLE;
   s->name = SYSTEM_SYSTEM;
   s->arch = ARCH_NOARCH;
@@ -109,22 +118,18 @@ void
 pool_free(Pool *pool)
 {
   int i;
-  Source *source;
 
   pool_freewhatprovides(pool);
   pool_freeidhashes(pool);
-  for (i = 0; i < pool->nsources; i++)
-    {
-      source = pool->sources[i];
-      xfree(source->idarraydata);
-      xfree(source->rpmdbid);
-      xfree(source);
-    }
+  pool_freeallrepos(pool, 1);
+  xfree(pool->id2arch);
   xfree(pool->solvables);
-  xfree(pool->sources);
   xfree(pool->stringspace);
   xfree(pool->strings);
   xfree(pool->rels);
+  queue_free(&pool->vendormap);
+  for (i = 0; i < DEP2STRBUF; i++)
+    xfree(pool->dep2strbuf[i]);
   xfree(pool);
 }
 
@@ -247,11 +252,10 @@ void
 pool_prepare(Pool *pool)
 {
   int i, num, np, extra;
-  unsigned int n;
   Offset off;
   Solvable *s;
   Id id;
-  Offset *idp;
+  Offset *idp, n;
   Offset *whatprovides;
   Id *whatprovidesdata, *d;
 
@@ -274,7 +278,7 @@ pool_prepare(Pool *pool)
        continue;
       if (!pool_installable(pool, s))
        continue;
-      pp = s->source->idarraydata + s->provides;
+      pp = s->repo->idarraydata + s->provides;
       while ((id = *pp++) != ID_NULL)
        {
          if (ISRELDEP(id))
@@ -323,7 +327,7 @@ pool_prepare(Pool *pool)
        continue;
 
       /* for all provides of this solvable */
-      pp = s->source->idarraydata + s->provides;
+      pp = s->repo->idarraydata + s->provides;
       while ((id = *pp++) != 0)
        {
          if (ISRELDEP(id))
@@ -401,9 +405,9 @@ pool_queuetowhatprovides(Pool *pool, Queue *q)
 /******************************************************************************/
 
 /*
- * addrangedep
+ * addrelproviders
  * 
- * add RangeDep to whatprovides
+ * add packages fulfilling the relation to whatprovides array
  * no exact providers, do range match
  * 
  */
@@ -422,7 +426,7 @@ pool_addrelproviders(Pool *pool, Id d)
   Id p, *pp, *pp2, *pp3;
 
   d = GETRELID(pool, d);
-  queueinit_buffer(&plist, buf, sizeof(buf)/sizeof(*buf));
+  queue_init_buffer(&plist, buf, sizeof(buf)/sizeof(*buf));
   switch (flags)
     {
     case REL_AND:
@@ -434,7 +438,7 @@ pool_addrelproviders(Pool *pool, Id d)
          for (pp3 = pp2; *pp3;)
            if (*pp3++ == p)
              {
-               queuepush(&plist, p);
+               queue_push(&plist, p);
                break;
              }
        }
@@ -442,10 +446,10 @@ pool_addrelproviders(Pool *pool, Id d)
     case REL_OR:
       pp = GET_PROVIDESP(name, p);
       while ((p = *pp++) != 0)
-       queuepush(&plist, p);
+       queue_push(&plist, p);
       pp = GET_PROVIDESP(evr, p);
       while ((p = *pp++) != 0)
-       queuepushunique(&plist, p);
+       queue_pushunique(&plist, p);
       break;
     case REL_NAMESPACE:
       if (pool->nscallback)
@@ -453,12 +457,12 @@ pool_addrelproviders(Pool *pool, Id d)
          p = pool->nscallback(pool, pool->nscallbackdata, name, evr);
          if (p > 1)
            {
-             queuefree(&plist);
+             queue_free(&plist);
              pool->whatprovides[d] = p;
              return pool->whatprovidesdata + p;
            }
          if (p == 1)
-           queuepush(&plist, SYSTEMSOLVABLE);
+           queue_push(&plist, SYSTEMSOLVABLE);
        }
       break;
     default:
@@ -479,7 +483,7 @@ pool_addrelproviders(Pool *pool, Id d)
            printf("addrelproviders: checking package %s\n", id2str(pool, pool->p[p].name));
 #endif
          /* solvable p provides name in some rels */
-         pidp = pool->solvables[p].source->idarraydata + pool->solvables[p].provides;
+         pidp = pool->solvables[p].repo->idarraydata + pool->solvables[p].provides;
          while ((pid = *pidp++) != 0)
            {
              int pflags;
@@ -515,18 +519,18 @@ pool_addrelproviders(Pool *pool, Id d)
            }
          if (!pid)
            continue;   /* no rel match */
-         queuepush(&plist, p);
+         queue_push(&plist, p);
        }
       /* make our system solvable provide all unknown rpmlib() stuff */
       if (plist.count == 0 && !strncmp(id2str(pool, name), "rpmlib(", 7))
-       queuepush(&plist, SYSTEMSOLVABLE);
+       queue_push(&plist, SYSTEMSOLVABLE);
     }
   /* add providers to whatprovides */
 #if 0
   if (pool->verbose) printf("addrelproviders: adding %d packages to %d\n", plist.count, d);
 #endif
   pool->whatprovides[d] = pool_queuetowhatprovides(pool, &plist);
-  queuefree(&plist);
+  queue_free(&plist);
 
   return pool->whatprovidesdata + pool->whatprovides[d];
 }