diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-01-09 16:07:50 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-01-09 16:48:40 +0100 |
| commit | fd95fa4f42afa73d09a3d32e88acd083fef756d5 (patch) | |
| tree | 7fdc3a0d8400e9abfdbed4f44267aecbab895bcd /ffi/src/openpgp/armor.rs | |
| parent | 2a0e31feb5359887fc7574e9957bea0905950d63 (diff) | |
ffi: Use *const T for non-optional arguments.
- Previously, Option<&T> was used, primarily because it was more
ergonomic in Rust. However, this gave the impression that the
argument was optional.
- Likewise for mutable references.
- This patch addresses all pointers to Rust values.
- See #149.
Diffstat (limited to 'ffi/src/openpgp/armor.rs')
| -rw-r--r-- | ffi/src/openpgp/armor.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ffi/src/openpgp/armor.rs b/ffi/src/openpgp/armor.rs index f426fb0a..80b0e74c 100644 --- a/ffi/src/openpgp/armor.rs +++ b/ffi/src/openpgp/armor.rs @@ -130,7 +130,7 @@ fn kind_to_int(kind: Option<armor::Kind>) -> c_int { /// } /// ``` #[no_mangle] -pub extern "system" fn sq_armor_reader_new(inner: Option<&'static mut Box<Read>>, +pub extern "system" fn sq_armor_reader_new(inner: *mut Box<Read>, kind: c_int) -> *mut Box<Read> { let inner = ffi_param_ref_mut!(inner); @@ -141,7 +141,7 @@ pub extern "system" fn sq_armor_reader_new(inner: Option<&'static mut Box<Read>> /// Creates a `Reader` from a file. #[no_mangle] -pub extern "system" fn sq_armor_reader_from_file(ctx: Option<&mut Context>, +pub extern "system" fn sq_armor_reader_from_file(ctx: *mut Context, filename: *const c_char, kind: c_int) -> *mut Box<Read> { @@ -213,9 +213,9 @@ pub extern "system" fn sq_armor_reader_kind(reader: *mut Box<Read>) /// /// [this]: fn.sq_armor_reader_new.html #[no_mangle] -pub extern "system" fn sq_armor_reader_headers(ctx: Option<&mut Context>, +pub extern "system" fn sq_armor_reader_headers(ctx: *mut Context, reader: *mut Box<Read>, - len: Option<&mut size_t>) + len: *mut size_t) -> *mut ArmorHeader { let ctx = ffi_param_ref_mut!(ctx); let len = ffi_param_ref_mut!(len); @@ -345,10 +345,10 @@ fn strdup(s: &str) -> *mut c_char { /// ``` #[no_mangle] pub extern "system" fn sq_armor_writer_new - (ctx: Option<&mut Context>, - inner: Option<&'static mut Box<Write>>, + (ctx: *mut Context, + inner: *mut Box<Write>, kind: c_int, - header: Option<&ArmorHeader>, + header: *const ArmorHeader, header_len: size_t) -> *mut Box<Write> { |