diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-05-19 11:39:21 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-05-19 12:02:56 +0300 |
| commit | d0edeec8fb8fa5abee8b3065cea5e4882d0c51c4 (patch) | |
| tree | 10dbc6d72c9cef13a26cb539df43e92e4bf78d74 /src/commit.c | |
| parent | 12fdf6fc219321d22825042ae08efd322acc0310 (diff) | |
| download | apk-tools-d0edeec8fb8fa5abee8b3065cea5e4882d0c51c4.tar.gz apk-tools-d0edeec8fb8fa5abee8b3065cea5e4882d0c51c4.tar.bz2 apk-tools-d0edeec8fb8fa5abee8b3065cea5e4882d0c51c4.tar.xz apk-tools-d0edeec8fb8fa5abee8b3065cea5e4882d0c51c4.zip | |
make the atom functions not use global state
This greatly helps with memory management on applications that
may want to daemonize and open/close database several times.
Also the lifetime and "owner" of memory for all data is now
explicitly bound to owning struct apk_database, which might
be helpful when writing language bindings. As side effect, the
interned "atoms" are unique only within what apk_database, so
comparing packages from different apk_database may not work
as expected.
Fixes #10697
Diffstat (limited to 'src/commit.c')
| -rw-r--r-- | src/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/commit.c b/src/commit.c index 8c337e3..b82607c 100644 --- a/src/commit.c +++ b/src/commit.c @@ -453,8 +453,8 @@ static void print_conflicts(struct print_state *ps, struct apk_package *pkg) foreach_array_item(p, d->name->providers) { if (!p->pkg->marked) continue; - if (d->version == &apk_null_blob && - p->version == &apk_null_blob) + if (d->version == &apk_atom_null && + p->version == &apk_atom_null) continue; if (once && p->pkg == pkg && p->version == d->version) { |