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_add.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_add.c')
| -rw-r--r-- | src/app_add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app_add.c b/src/app_add.c index fb6e0e0..1f6c875 100644 --- a/src/app_add.c +++ b/src/app_add.c @@ -100,9 +100,9 @@ static struct apk_package *create_virtual_package(struct apk_database *db, struc if (virtpkg == NULL) return 0; virtpkg->name = name; - virtpkg->version = apk_blob_atomize_dup(APK_BLOB_STR(ver)); + virtpkg->version = apk_atomize_dup(&db->atoms, APK_BLOB_STR(ver)); virtpkg->description = strdup("virtual meta package"); - virtpkg->arch = apk_blob_atomize(APK_BLOB_STR("noarch")); + virtpkg->arch = apk_atomize(&db->atoms, APK_BLOB_STR("noarch")); mdctx = EVP_MD_CTX_new(); EVP_DigestInit_ex(mdctx, apk_checksum_default(), NULL); @@ -135,7 +135,7 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array apk_blob_pull_dep(&b, db, &virtdep); if (APK_BLOB_IS_NULL(b) || virtdep.conflict || virtdep.result_mask != APK_DEPMASK_ANY || - virtdep.version != &apk_null_blob) { + virtdep.version != &apk_atom_null) { apk_error("%s: bad package specifier"); return -1; } |