diff options
author | Neal H. Walfield <neal@pep.foundation> | 2020-04-03 11:15:05 +0200 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2020-04-03 11:34:02 +0200 |
commit | 72bb51dc3ba1d368cad1d833a734d39a32ba3149 (patch) | |
tree | f04f5746b41ce4a92058502d3e2868361f7e1150 /openpgp-ffi/src/serialize.rs | |
parent | 8ebaf6e4ada1cea0b9e6f6dfee61c22cfdc9748c (diff) |
openpgp: Rename KeyIter to KeyAmalgamationIter
- Rename `KeyIter` to `KeyAmalgamationIter`, `ValidKeyIter` to
`ValidKeyAmalgamationIter`.
- Rename `cert/keyiter.rs` to `cert/amalgamation/iter.rs`.
Diffstat (limited to 'openpgp-ffi/src/serialize.rs')
-rw-r--r-- | openpgp-ffi/src/serialize.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openpgp-ffi/src/serialize.rs b/openpgp-ffi/src/serialize.rs index bcd2d6f2..b137a485 100644 --- a/openpgp-ffi/src/serialize.rs +++ b/openpgp-ffi/src/serialize.rs @@ -37,8 +37,8 @@ use self::openpgp::serialize::{ use super::keyid::KeyID; use super::packet::key::Key; -use super::cert::KeyIterWrapper; -use super::cert::ValidKeyIterWrapper; +use super::cert::KeyAmalgamationIterWrapper; +use super::cert::ValidKeyAmalgamationIterWrapper; /// Streams an OpenPGP message. /// @@ -279,7 +279,7 @@ fn pgp_recipient_set_keyid(recipient: *mut Recipient, keyid: *mut KeyID) { /// libc's allocator. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_recipients_from_key_iter<'a>( - iter_wrapper: *mut KeyIterWrapper<'a>, + iter_wrapper: *mut KeyAmalgamationIterWrapper<'a>, result_len: *mut size_t) -> *mut *mut Recipient<'a> { @@ -311,7 +311,7 @@ fn pgp_recipients_from_key_iter<'a>( /// libc's allocator. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_recipients_from_valid_key_iter<'a>( - iter_wrapper: *mut ValidKeyIterWrapper<'a>, + iter_wrapper: *mut ValidKeyAmalgamationIterWrapper<'a>, result_len: *mut size_t) -> *mut *mut Recipient<'a> { |