support haiku package naming in selection_canon

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

diff --git a/src/repo_solv.c b/src/repo_solv.c
index 0f967b9..2835c30 100644 (file)
--- a/src/repo_solv.c
+++ b/src/repo_solv.c
@@ -453,9 +453,8 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
   char *sp;                           /* pointer into string space */
   Id *idmap;                          /* map of repo Ids to pool Ids */
   Id id, type;
-  unsigned int hashmask, h;
-  int hh;
-  Id *hashtbl;
+  Hashval hashmask, h, hh;
+  Hashtable hashtbl;
   Id name, evr, did;
   int relflags;
   Reldep *ran;
@@ -576,9 +575,8 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
     {
       data.localpool = 1;
       spool = &data.spool;
-      spool->sstrings = 7 + sizeid + 1;
-      spool->nstrings = numid < 2 ? 2 : numid;
-      stringpool_shrink(spool);                /* we misuse stringpool_shrink to alloc the stringpool in the correct size */
+      spool->stringspace = solv_malloc(7 + sizeid + 1); 
+      spool->strings = solv_malloc2(numid < 2 ?  2 : numid, sizeof(Offset));
       strcpy(spool->stringspace, "<NULL>");
       spool->sstrings = 7;
       spool->nstrings = 1;
@@ -594,7 +592,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
   if ((solvflags & SOLV_FLAG_PREFIX_POOL) == 0)
     {
       if (sizeid && fread(strsp, sizeid, 1, fp) != 1)
-        return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+       {
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+       }
     }
   else
     {
@@ -606,9 +607,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       int freesp = sizeid;
 
       if (pfsize && fread(prefix, pfsize, 1, fp) != 1)
-        {
+       {
          solv_free(prefix);
-          return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
        }
       for (i = 1; i < numid; i++)
         {
@@ -618,6 +620,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
          if (freesp < 0)
            {
              solv_free(prefix);
+             repodata_freedata(&data);
              return pool_error(pool, SOLV_ERROR_OVERFLOW, "overflow while expanding strings");
            }
          if (same)
@@ -629,7 +632,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
        }
       solv_free(prefix);
       if (freesp != 0)
-       return pool_error(pool, SOLV_ERROR_CORRUPT, "expanding strings size mismatch");
+       {
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_CORRUPT, "expanding strings size mismatch");
+       }
     }
   strsp[sizeid] = 0;                  /* make string space \0 terminated */
   sp = strsp;
@@ -644,12 +650,16 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       if (*sp)
        {
          /* we need id 1 to be '' for directories */
+         repodata_freedata(&data);
          return pool_error(pool, SOLV_ERROR_CORRUPT, "store strings don't start with an empty string");
        }
       for (i = 1; i < spool->nstrings; i++)
        {
          if (sp >= strsp + sizeid && numid >= 2)
-           return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings");
+           {
+             repodata_freedata(&data);
+             return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings");
+           }
          str[i] = sp - spool->stringspace;
          sp += strlen(sp) + 1;
        }
@@ -657,6 +667,8 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
     }
   else
     {
+      Offset oldsstrings = spool->sstrings;
+
       /* alloc id map for name and rel Ids. this maps ids in the solv files
        * to the ids in our pool */
       idmap = solv_calloc(numid + numrel, sizeof(Id));
@@ -695,8 +707,11 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
        {
          if (sp >= strsp + sizeid)
            {
-             solv_free(hashtbl);
              solv_free(idmap);
+             spool->nstrings = oldnstrings;
+             spool->sstrings = oldsstrings;
+             stringpool_freehash(spool);
+             repodata_freedata(&data);
              return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings %d %d", i, numid);
            }
          if (!*sp)                            /* empty string */
@@ -1275,6 +1290,7 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
       data.incoredata = solv_realloc(data.incoredata, data.incoredatalen);
       data.incoredatafree = 0;
     }
+  solv_free(idmap);
 
   for (i = 1; i < numkeys; i++)
     if (keys[i].storage == KEY_STORAGE_VERTICAL_OFFSET)
@@ -1294,23 +1310,22 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
          }
       data.lastverticaloffset = fileoffset;
       pagesize = read_u32(&data);
-      data.error = repopagestore_read_or_setup_pages(&data.store, data.fp, pagesize, fileoffset);
-      if (data.error == SOLV_ERROR_EOF)
-        pool_error(pool, data.error, "repopagestore setup: unexpected EOF");
-      else if (data.error)
-        pool_error(pool, data.error, "repopagestore setup failed");
-    }
-  else
-    {
-      /* no longer needed */
-      data.fp = 0;
+      if (!data.error)
+       {
+         data.error = repopagestore_read_or_setup_pages(&data.store, data.fp, pagesize, fileoffset);
+         if (data.error == SOLV_ERROR_EOF)
+           pool_error(pool, data.error, "repopagestore setup: unexpected EOF");
+         else if (data.error)
+           pool_error(pool, data.error, "repopagestore setup failed");
+       }
     }
-  solv_free(idmap);
+  data.fp = 0; /* no longer needed */
 
   if (data.error)
     {
-      /* XXX: free repodata? */
-      return data.error;
+      i = data.error;
+      repodata_freedata(&data);
+      return i;
     }
 
   if (parent)