diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-04-28 13:28:32 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-04-28 13:28:32 +0300 |
| commit | 5c349335c76d8b6f1f1e721096d71e3b16f13dbc (patch) | |
| tree | 4380c3160edbe2349e09ce84237779b6ae45fc5c /src/database.c | |
| parent | ba7b50c0f8ac7c8a88b03856037d9ca6618cccd5 (diff) | |
| download | apk-tools-5c349335c76d8b6f1f1e721096d71e3b16f13dbc.tar.gz apk-tools-5c349335c76d8b6f1f1e721096d71e3b16f13dbc.tar.bz2 apk-tools-5c349335c76d8b6f1f1e721096d71e3b16f13dbc.tar.xz apk-tools-5c349335c76d8b6f1f1e721096d71e3b16f13dbc.zip | |
db: separate init from open
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/database.c b/src/database.c index 80b80e9..8230764 100644 --- a/src/database.c +++ b/src/database.c @@ -1471,6 +1471,21 @@ static unsigned long map_statfs_flags(unsigned long f_flag) return mnt_flags; } +void apk_db_init(struct apk_database *db) +{ + memset(db, 0, sizeof(*db)); + apk_hash_init(&db->available.names, &pkg_name_hash_ops, 20000); + apk_hash_init(&db->available.packages, &pkg_info_hash_ops, 10000); + apk_hash_init(&db->installed.dirs, &dir_hash_ops, 20000); + apk_hash_init(&db->installed.files, &file_hash_ops, 200000); + list_init(&db->installed.packages); + list_init(&db->installed.triggers); + apk_dependency_array_init(&db->world); + apk_protected_path_array_init(&db->protected_paths); + db->permanent = 1; + db->root_fd = -1; +} + int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) { const char *msg = NULL; @@ -1483,7 +1498,6 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) apk_default_acl_dir = apk_db_acl_atomize(0755, 0, 0, NULL); apk_default_acl_file = apk_db_acl_atomize(0644, 0, 0, NULL); - memset(db, 0, sizeof(*db)); if (apk_flags & APK_SIMULATE) { dbopts->open_flags &= ~(APK_OPENF_CREATE | APK_OPENF_WRITE); dbopts->open_flags |= APK_OPENF_READ; @@ -1495,16 +1509,6 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) } if (!dbopts->cache_dir) dbopts->cache_dir = "etc/apk/cache"; - apk_hash_init(&db->available.names, &pkg_name_hash_ops, 20000); - apk_hash_init(&db->available.packages, &pkg_info_hash_ops, 10000); - apk_hash_init(&db->installed.dirs, &dir_hash_ops, 20000); - apk_hash_init(&db->installed.files, &file_hash_ops, 200000); - list_init(&db->installed.packages); - list_init(&db->installed.triggers); - apk_dependency_array_init(&db->world); - apk_protected_path_array_init(&db->protected_paths); - db->permanent = 1; - apk_db_setup_repositories(db, dbopts->cache_dir); db->root = strdup(dbopts->root ?: "/"); |