From 044854773282eed2be23aab511d5dc38ffbe21ca Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 18 Sep 2019 16:04:18 +0200 Subject: openpgp: Combine Signature4::signature_alive and its _at variant. - Combine Signature4::signature_alive and Signature4::signature_alive_at. - Use an Into> to distinguish the two previous cases: the current time (None), and a specific time (a time::Tm). --- openpgp-ffi/include/sequoia/openpgp.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'openpgp-ffi/include') diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index c84fb582..c6157b70 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -378,21 +378,15 @@ bool pgp_signature_is_split_key(pgp_signature_t signature); /*/ bool pgp_signature_is_group_key(pgp_signature_t signature); -/*/ -/// Returns whether the signature is alive. -/// -/// A signature is alive if the creation date is in the past, and the -/// signature has not expired. -/*/ -bool pgp_signature_alive(pgp_signature_t signature); - /*/ /// Returns whether the signature is alive at the specified time. /// +/// If `when` is 0, then the current time is used. +/// /// A signature is alive if the creation date is in the past, and the /// signature has not expired at the specified time. /*/ -bool pgp_signature_alive_at(pgp_signature_t signature, time_t when); +bool pgp_signature_alive(pgp_signature_t signature, time_t when); /*/ /// Returns whether the signature is expired at the specified time. -- cgit v1.2.3