]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
- use repo_free_solvable instead of repo_free_solvable_block when freeing a single...
authorMichael Schroeder <mls@suse.de>
Thu, 12 Apr 2012 13:10:35 +0000 (15:10 +0200)
committerMichael Schroeder <mls@suse.de>
Thu, 12 Apr 2012 13:10:35 +0000 (15:10 +0200)
ext/repo_arch.c
ext/repo_content.c
ext/repo_deb.c
ext/repo_mdk.c
ext/repo_rpmdb.c

index 183d13d45e0b3e67477229bfedc229751c8d37b4..0a9089ed3001edfb5761f9a8fb916bd2af104ec6 100644 (file)
@@ -437,7 +437,7 @@ repo_add_arch_pkg(Repo *repo, const char *fn, int flags)
   fclose(fp);
   if (s && !s->name)
     {
-      repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+      repo_free_solvable(repo, s - pool->solvables, 1);
       s = 0;
     }
   if (s)
@@ -719,7 +719,7 @@ finishsolvable(Repo *repo, Solvable *s)
     return;
   if (!s->name)
     {
-      repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+      repo_free_solvable(repo, s - pool->solvables, 1);
       return;
     }
   if (!s->arch)
index 8a4c7318c25da313162b39063b884cadd432fb65..a51f7c23adc6660a347146eba0d7331d35eb1edc 100644 (file)
@@ -499,7 +499,7 @@ repo_add_content(Repo *repo, FILE *fp, int flags)
   if (s && !s->name)
     {
       pool_debug(pool, SOLV_FATAL, "repo_content: 'content' incomplete, no product solvable created!\n");
-      repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+      repo_free_solvable(repo, s - pool->solvables, 1);
       s = 0;
     }
   if (s)
index 4f8639039f09ac2a373cc215812122a6bb635075..38327c6ac6a77cf8b3acd6b174c64e90da829a6d 100644 (file)
@@ -392,7 +392,7 @@ repo_add_debpackages(Repo *repo, FILE *fp, int flags)
       s = pool_id2solvable(pool, repo_add_solvable(repo));
       control2solvable(s, data, buf);
       if (!s->name)
-       repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+       repo_free_solvable(repo, s - pool->solvables, 1);
       if (l > ll)
         memmove(buf, p + 1, l - ll);
       l -= ll;
@@ -404,7 +404,7 @@ repo_add_debpackages(Repo *repo, FILE *fp, int flags)
       s = pool_id2solvable(pool, repo_add_solvable(repo));
       control2solvable(s, data, buf);
       if (!s->name)
-       repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+       repo_free_solvable(repo, s - pool->solvables, 1);
     }
   solv_free(buf);
   if (!(flags & REPO_NO_INTERNALIZE))
index f8ece96a07e2c08541a29418978bdce71a66eeb5..7fa0abd8a41d57e2c5aabbcc2c85a248c262b2e9 100644 (file)
@@ -241,7 +241,7 @@ repo_add_mdk(Repo *repo, FILE *fp, int flags)
   if (s)
     {
       pool_debug(pool, SOLV_ERROR, "unclosed package at EOF\n");
-      repo_free_solvable_block(s->repo, s - pool->solvables, 1, 1);
+      repo_free_solvable(s->repo, s - pool->solvables, 1);
     }
   solv_free(buf);
   if (!(flags & REPO_NO_INTERNALIZE))
index 5495c62745dadeb82d32e8201367d45f06c6346f..1c6813959f5d9a726bedc8432d295164c7318105 100644 (file)
@@ -1544,7 +1544,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir, int flags)
       if (s)
        {
          /* oops, could not reuse. free it instead */
-          repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+          repo_free_solvable(repo, s - pool->solvables, 1);
          solvend--;
          s = 0;
        }