summaryrefslogtreecommitdiffstats
path: root/g10/gpgv.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-08-05 14:40:36 +0200
committerWerner Koch <wk@gnupg.org>2016-08-10 16:55:04 +0200
commit5b59999ce0dd1650ebe47a74a30ded6af00eeed3 (patch)
treec54e05104131ed154ddb282df92ed412c2b95bab /g10/gpgv.c
parentg10: Fix opening of trust database. (diff)
downloadgnupg2-5b59999ce0dd1650ebe47a74a30ded6af00eeed3.tar.xz
gnupg2-5b59999ce0dd1650ebe47a74a30ded6af00eeed3.zip
gpg: Remove tofu database format "split".
* g10/options.h (struct opt): Remove field tofu_db_format. * g10/gpg.h (server_control_s): Add fields tofu.batch_update_ref and tofu.batch_update_started. * g10/gpg.c (parse_tofu_db_format): Remove. (main): Make option --tofu-db-format obsolete. * g10/tofu.c: Major rework. Remove the pretty complicated and slower split format and with that all the caching. Use the dbs struct directly. Move global vars for batch update into CTRL. Change calling conventions of some function to take CTRL or DBS pointers instead of the former low-level database pointer. -- The split database format might have been nice for use with Unison but it bypasses the concept of a relational database by doing parts of this itself and also risking deadlocks. Working with the Tofu database for debugging or experiments is also not possible with parts of the database logic implemented in gpg. The Tofu support is quite new and we can assume that it is not in real use now. Thus we better remove that now so that we do not need to maintain it for all future. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/gpgv.c')
-rw-r--r--g10/gpgv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 729fcf843..fd1090eb4 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -680,11 +680,13 @@ tofu_policy_str (enum tofu_policy policy)
}
void
-tofu_begin_batch_update (void)
+tofu_begin_batch_update (ctrl_t ctrl)
{
+ (void)ctrl;
}
void
-tofu_end_batch_update (void)
+tofu_end_batch_update (ctrl_t ctrl)
{
+ (void)ctrl;
}