projects
/
platform
/
upstream
/
libsolv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.7.2
[platform/upstream/libsolv.git]
/
ext
/
repo_cudf.c
diff --git
a/ext/repo_cudf.c
b/ext/repo_cudf.c
index
14ddcc9
..
64bb86f
100644
(file)
--- a/
ext/repo_cudf.c
+++ b/
ext/repo_cudf.c
@@
-224,10
+224,7
@@
repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags)
if (!*buf)
{
if (s && !repo && !isinstalled)
if (!*buf)
{
if (s && !repo && !isinstalled)
- {
- repo_free_solvable(repo, s - pool->solvables, 1);
- s = 0;
- }
+ s = solvable_free(s, 1);
if (s)
finishpackage(pool, s, keep, job);
s = 0;
if (s)
finishpackage(pool, s, keep, job);
s = 0;
@@
-323,10
+320,7
@@
repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags)
{
isinstalled = 1;
if (!installedrepo)
{
isinstalled = 1;
if (!installedrepo)
- {
- repo_free_solvable(repo, s - pool->solvables, 1);
- s = 0;
- }
+ s = solvable_free(s, 1);
else if (s->repo != installedrepo)
{
copysolvabledata(pool, s, installedrepo);
else if (s->repo != installedrepo)
{
copysolvabledata(pool, s, installedrepo);
@@
-371,10
+365,7
@@
repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags)
}
}
if (s && !repo && !isinstalled)
}
}
if (s && !repo && !isinstalled)
- {
- repo_free_solvable(repo, s - pool->solvables, 1);
- s = 0;
- }
+ s = solvable_free(s, 1);
if (s)
finishpackage(pool, s, keep, job);
solv_free(buf);
if (s)
finishpackage(pool, s, keep, job);
solv_free(buf);