diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-02-12 13:17:22 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-02-12 13:21:08 +0100 |
| commit | d51227e61c379f08a91610ddb2678c44fae6d9eb (patch) | |
| tree | 6c770ce1639159bbb18c5b4c31830a21414a2a2a | |
| parent | 08f0ec7dc4952989d86f2e5d0f954c7420f8f217 (diff) | |
openpgp-ffi: Rename function.
- See #160.
| -rw-r--r-- | openpgp-ffi/include/sequoia/openpgp.h | 2 | ||||
| -rw-r--r-- | openpgp-ffi/src/packet/signature.rs | 2 | ||||
| -rw-r--r-- | openpgp-ffi/src/tpk.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index 36e9c18a..e3acf157 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -573,7 +573,7 @@ void pgp_signature_free (pgp_signature_t signature); /*/ /// Converts the signature to a packet. /*/ -pgp_packet_t pgp_signature_to_packet (pgp_signature_t signature); +pgp_packet_t pgp_signature_into_packet (pgp_signature_t signature); /*/ /// Returns the value of the `Signature` packet's Issuer subpacket. diff --git a/openpgp-ffi/src/packet/signature.rs b/openpgp-ffi/src/packet/signature.rs index aaec071e..0b85b204 100644 --- a/openpgp-ffi/src/packet/signature.rs +++ b/openpgp-ffi/src/packet/signature.rs @@ -28,7 +28,7 @@ pub extern "system" fn pgp_signature_free(s: Option<&mut Signature>) { /// Converts the signature to a packet. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] -pub extern "system" fn pgp_signature_to_packet(s: *mut Signature) +pub extern "system" fn pgp_signature_into_packet(s: *mut Signature) -> *mut Packet { let s = ffi_param_move!(s); diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs index a816fb31..d5a7de12 100644 --- a/openpgp-ffi/src/tpk.rs +++ b/openpgp-ffi/src/tpk.rs @@ -209,7 +209,7 @@ fn int_to_reason_for_revocation(code: c_int) -> ReasonForRevocation { /// pgp_signer_free (primary_signer); /// pgp_key_pair_free (primary_keypair); /// -/// pgp_packet_t packet = pgp_signature_to_packet (revocation); +/// pgp_packet_t packet = pgp_signature_into_packet (revocation); /// tpk = pgp_tpk_merge_packets (NULL, tpk, &packet, 1); /// assert (tpk); /// |