summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/src/serialize.rs
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-01-29 14:16:30 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-01-29 17:41:26 +0100
commite5f3ae121f39b46cbc0416acb4ba7049f40203d2 (patch)
tree96b9c4881271006f76e8e3f6ff90cfe2335e8d20 /openpgp-ffi/src/serialize.rs
parent442740975e41208c1cad300bc023ddedb04fc3a6 (diff)
openpgp-ffi: Convert Error.
Diffstat (limited to 'openpgp-ffi/src/serialize.rs')
-rw-r--r--openpgp-ffi/src/serialize.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/openpgp-ffi/src/serialize.rs b/openpgp-ffi/src/serialize.rs
index f94cb2ad..93c0895d 100644
--- a/openpgp-ffi/src/serialize.rs
+++ b/openpgp-ffi/src/serialize.rs
@@ -50,7 +50,7 @@ pub extern "system" fn pgp_writer_stack_message
/// Writes up to `len` bytes of `buf` into `writer`.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_writer_stack_write
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
writer: *mut writer::Stack<'static, Cookie>,
buf: *const uint8_t, len: size_t)
-> ssize_t
@@ -71,7 +71,7 @@ pub extern "system" fn pgp_writer_stack_write
/// EINTR.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_writer_stack_write_all
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
writer: *mut writer::Stack<'static, Cookie>,
buf: *const uint8_t, len: size_t)
-> Status
@@ -88,7 +88,7 @@ pub extern "system" fn pgp_writer_stack_write_all
/// Finalizes this writer, returning the underlying writer.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_writer_stack_finalize_one
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
writer: *mut writer::Stack<'static, Cookie>)
-> *mut writer::Stack<'static, Cookie>
{
@@ -104,7 +104,7 @@ pub extern "system" fn pgp_writer_stack_finalize_one
/// Finalizes all writers, tearing down the whole stack.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_writer_stack_finalize
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
writer: *mut writer::Stack<'static, Cookie>)
-> Status
{
@@ -124,7 +124,7 @@ pub extern "system" fn pgp_writer_stack_finalize
/// body is short, using full length encoding.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_arbitrary_writer_new
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
inner: *mut writer::Stack<'static, Cookie>,
tag: uint8_t)
-> *mut writer::Stack<'static, Cookie>
@@ -141,7 +141,7 @@ pub extern "system" fn pgp_arbitrary_writer_new
/// writes a signature packet.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_signer_new
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
inner: *mut writer::Stack<'static, Cookie>,
signers: *const *mut Box<self::openpgp::crypto::Signer>,
signers_len: size_t)
@@ -165,7 +165,7 @@ pub extern "system" fn pgp_signer_new
/// Creates a signer for a detached signature.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_signer_new_detached
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
inner: *mut writer::Stack<'static, Cookie>,
signers: *const *mut Box<self::openpgp::crypto::Signer>,
signers_len: size_t)
@@ -192,7 +192,7 @@ pub extern "system" fn pgp_signer_new_detached
/// body is short, using full length encoding.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_literal_writer_new
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
inner: *mut writer::Stack<'static, Cookie>)
-> *mut writer::Stack<'static, Cookie>
{
@@ -214,7 +214,7 @@ pub extern "system" fn pgp_literal_writer_new
/// preferences.
#[::ffi_catch_abort] #[no_mangle]
pub extern "system" fn pgp_encryptor_new
- (errp: Option<&mut *mut failure::Error>,
+ (errp: Option<&mut *mut ::error::Error>,
inner: *mut writer::Stack<'static, Cookie>,
passwords: Option<&*const c_char>, passwords_len: size_t,
recipients: Option<&&TPK>, recipients_len: size_t,