summaryrefslogtreecommitdiffstats
path: root/ffi/src/openpgp/armor.rs
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-01-09 15:54:10 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-01-09 15:55:24 +0100
commit2a0e31feb5359887fc7574e9957bea0905950d63 (patch)
tree729093cc2e7385a81d07bf86c4d637aa78b5c236 /ffi/src/openpgp/armor.rs
parent70e1f1bec5acefb3fb2561d07ea53334be2663fc (diff)
ffi: Use ffi_param_ref_mut for mutable arguments.
Diffstat (limited to 'ffi/src/openpgp/armor.rs')
-rw-r--r--ffi/src/openpgp/armor.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/ffi/src/openpgp/armor.rs b/ffi/src/openpgp/armor.rs
index b3ed8edb..f426fb0a 100644
--- a/ffi/src/openpgp/armor.rs
+++ b/ffi/src/openpgp/armor.rs
@@ -133,7 +133,7 @@ fn kind_to_int(kind: Option<armor::Kind>) -> c_int {
pub extern "system" fn sq_armor_reader_new(inner: Option<&'static mut Box<Read>>,
kind: c_int)
-> *mut Box<Read> {
- let inner = ffi_param_ref!(inner);
+ let inner = ffi_param_ref_mut!(inner);
let kind = int_to_kind(kind);
box_raw!(Box::new(armor::Reader::new(inner, kind)))
@@ -145,7 +145,7 @@ pub extern "system" fn sq_armor_reader_from_file(ctx: Option<&mut Context>,
filename: *const c_char,
kind: c_int)
-> *mut Box<Read> {
- let ctx = ffi_param_ref!(ctx);
+ let ctx = ffi_param_ref_mut!(ctx);
assert!(! filename.is_null());
let filename = unsafe {
CStr::from_ptr(filename).to_string_lossy().into_owned()
@@ -217,8 +217,8 @@ pub extern "system" fn sq_armor_reader_headers(ctx: Option<&mut Context>,
reader: *mut Box<Read>,
len: Option<&mut size_t>)
-> *mut ArmorHeader {
- let ctx = ffi_param_ref!(ctx);
- let len = ffi_param_ref!(len);
+ let ctx = ffi_param_ref_mut!(ctx);
+ let len = ffi_param_ref_mut!(len);
// We need to downcast `reader`. To do that, we need to do a
// little dance. We will momentarily take ownership of `reader`,
@@ -352,8 +352,8 @@ pub extern "system" fn sq_armor_writer_new
header_len: size_t)
-> *mut Box<Write>
{
- let ctx = ffi_param_ref!(ctx);
- let inner = ffi_param_ref!(inner);
+ let ctx = ffi_param_ref_mut!(ctx);
+ let inner = ffi_param_ref_mut!(inner);
let kind = int_to_kind(kind).expect("KIND must not be SQ_ARMOR_KIND_ANY");
let mut header_ = Vec::new();