From a70afe41f3940323e680b06da9744624dd94f214 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 12 Apr 2012 15:10:35 +0200 Subject: [PATCH] - use repo_free_solvable instead of repo_free_solvable_block when freeing a single solvable --- ext/repo_arch.c | 4 ++-- ext/repo_content.c | 2 +- ext/repo_deb.c | 4 ++-- ext/repo_mdk.c | 2 +- ext/repo_rpmdb.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/repo_arch.c b/ext/repo_arch.c index 183d13d..0a9089e 100644 --- a/ext/repo_arch.c +++ b/ext/repo_arch.c @@ -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) diff --git a/ext/repo_content.c b/ext/repo_content.c index 8a4c731..a51f7c2 100644 --- a/ext/repo_content.c +++ b/ext/repo_content.c @@ -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) diff --git a/ext/repo_deb.c b/ext/repo_deb.c index 4f86390..38327c6 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -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)) diff --git a/ext/repo_mdk.c b/ext/repo_mdk.c index f8ece96..7fa0abd 100644 --- a/ext/repo_mdk.c +++ b/ext/repo_mdk.c @@ -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)) diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 5495c62..1c68139 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -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; } -- 2.7.4