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/app_fetch.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/app_fetch.c')
| -rw-r--r-- | src/app_fetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app_fetch.c b/src/app_fetch.c index 8e73c0e..e6f4fbe 100644 --- a/src/app_fetch.c +++ b/src/app_fetch.c @@ -145,7 +145,7 @@ static int fetch_package(apk_hash_item item, void *pctx) } if (!(ctx->flags & FETCH_STDOUT)) { - if (apk_fileinfo_get(ctx->outdir_fd, filename, APK_CHECKSUM_NONE, &fi) == 0 && + if (apk_fileinfo_get(ctx->outdir_fd, filename, APK_CHECKSUM_NONE, &fi, &db->atoms) == 0 && fi.size == pkg->size) return 0; } @@ -227,7 +227,7 @@ static void mark_name_flags(struct apk_database *db, const char *match, struct a struct fetch_ctx *ctx = (struct fetch_ctx *) pctx; struct apk_dependency dep = (struct apk_dependency) { .name = name, - .version = &apk_null_blob, + .version = &apk_atom_null, .result_mask = APK_DEPMASK_ANY, }; |