openpgp-ffi, ffi, ffi-macros: Avoid deprecated integer types.

2 files changed, 12 insertions, 12 deletions

diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs
index df13bcbd..d1b953d1 100644
--- a/openpgp-ffi/src/parse/mod.rs
+++ b/openpgp-ffi/src/parse/mod.rs
@@ -9,7 +9,7 @@
 use std::mem::forget;
 use std::ptr;
 use std::slice;
-use libc::{uint8_t, c_char, c_int, size_t};
+use libc::{c_char, c_int, size_t};
 
 extern crate sequoia_openpgp as openpgp;
 extern crate time;
@@ -64,7 +64,7 @@ pub extern "C" fn pgp_packet_parser_from_file
 /// the stream.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_from_bytes
-    (errp: Option<&mut *mut ::error::Error>, b: *const uint8_t, len: size_t)
+    (errp: Option<&mut *mut ::error::Error>, b: *const u8, len: size_t)
      -> *mut PacketParserResult<'static> {
     ffi_make_fry_from_errp!(errp);
     assert!(!b.is_null());
@@ -125,7 +125,7 @@ pub extern "C" fn pgp_packet_parser_packet
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_recursion_depth
     (pp: *const PacketParser)
-     -> uint8_t {
+     -> u8 {
     let pp = ffi_param_ref!(pp);
     pp.recursion_depth() as u8
 }
@@ -276,7 +276,7 @@ pub extern "C" fn pgp_packet_parser_buffer_unread_content<'a>
     (errp: Option<&mut *mut ::error::Error>,
      pp: *mut PacketParser<'a>,
      len: *mut usize)
-     -> *const uint8_t {
+     -> *const u8 {
     ffi_make_fry_from_errp!(errp);
     let pp = ffi_param_ref_mut!(pp);
     let len = ffi_param_ref_mut!(len);
@@ -327,8 +327,8 @@ pub extern "C" fn pgp_packet_parser_finish<'a>
 pub extern "C" fn pgp_packet_parser_decrypt<'a>
     (errp: Option<&mut *mut ::error::Error>,
      pp: *mut PacketParser<'a>,
-     algo: uint8_t, // XXX
-     key: *const uint8_t, key_len: size_t)
+     algo: u8, // XXX
+     key: *const u8, key_len: size_t)
      -> Status {
     ffi_make_fry_from_errp!(errp);
     let pp = ffi_param_ref_mut!(pp);
diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index b887f5e6..f31124aa 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -11,7 +11,7 @@
 //! [`sequoia-openpgp::parse::stream`]: ../../../sequoia_openpgp/parse/stream/index.html
 
 use std::ptr;
-use libc::{c_int, c_void, uint8_t, time_t};
+use libc::{c_int, c_void, time_t};
 
 extern crate sequoia_openpgp as openpgp;
 extern crate time;
@@ -91,7 +91,7 @@ fn pgp_message_layer_variant(result: *const MessageLayer)
 /// members if the corresponding parameter is not `NULL`.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
 fn pgp_message_layer_compression(v: *const MessageLayer,
-                                 algo_r: Maybe<uint8_t>)
+                                 algo_r: Maybe<u8>)
                                  -> bool
 {
     use self::stream::MessageLayer::*;
@@ -112,8 +112,8 @@ fn pgp_message_layer_compression(v: *const MessageLayer,
 /// members if the corresponding parameter is not `NULL`.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
 fn pgp_message_layer_encryption(v: *const MessageLayer,
-                                sym_algo_r: Maybe<uint8_t>,
-                                aead_algo_r: Maybe<uint8_t>)
+                                sym_algo_r: Maybe<u8>,
+                                aead_algo_r: Maybe<u8>)
                                  -> bool
 {
     use self::stream::MessageLayer::*;
@@ -298,7 +298,7 @@ type InspectCallback = fn(*mut HelperCookie, *const PacketParser) -> Status;
 type DecryptCallback = fn(*mut HelperCookie,
                           *const *const PKESK, usize,
                           *const *const SKESK, usize,
-                          extern "C" fn (*mut c_void, uint8_t,
+                          extern "C" fn (*mut c_void, u8,
                                               *const crypto::SessionKey)
                                               -> Status,
                           *mut c_void,
@@ -717,7 +717,7 @@ impl DecryptionHelper for DHelper {
         // skesks.into_iter().for_each(|o| {
         //     super::super::packet::skesk::pgp_skesk_free(o) });
 
-        extern "C" fn trampoline<D>(data: *mut c_void, algo: uint8_t,
+        extern "C" fn trampoline<D>(data: *mut c_void, algo: u8,
                                          sk: *const crypto::SessionKey)
                                          -> Status
             where D: FnMut(SymmetricAlgorithm, &SessionKey)