diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-04-16 11:58:32 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-04-16 11:58:32 +0200 |
commit | 350320a32ce569d3e86352ba5a79ee969e9595af (patch) | |
tree | 87fe70395f62566d7d7e0cef3e93d62f6288a4e4 /openpgp-ffi | |
parent | e1ae4a79ada96a97f604d3f3f172b9b02a6da8bb (diff) |
Revert "openpgp: Make PacketParserResult a std::result::Result."
This reverts commit 2e1eec5fe4157a391a13554ff7df3075cfe043cc.
Diffstat (limited to 'openpgp-ffi')
-rw-r--r-- | openpgp-ffi/src/parse/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs index 06066a9d..d3ed1407 100644 --- a/openpgp-ffi/src/parse/mod.rs +++ b/openpgp-ffi/src/parse/mod.rs @@ -357,8 +357,8 @@ pub extern "C" fn pgp_packet_parser_result_tag<'a> let ppr = ffi_param_ref_mut!(ppr); let tag : u8 = match ppr { - Ok(ref pp) => pp.packet.tag().into(), - Err(_) => 0, + PacketParserResult::Some(ref pp) => pp.packet.tag().into(), + PacketParserResult::EOF(_) => 0, }; tag as c_int @@ -383,8 +383,8 @@ pub extern "C" fn pgp_packet_parser_result_packet_parser<'a> let ppr = ffi_param_move!(ppr); match *ppr { - Ok(pp) => box_raw!(pp), - Err(_) => { + PacketParserResult::Some(pp) => box_raw!(pp), + PacketParserResult::EOF(_) => { // Don't free ppr! forget(ppr); ptr::null_mut() @@ -411,10 +411,10 @@ pub extern "C" fn pgp_packet_parser_result_eof<'a> let ppr = ffi_param_move!(ppr); match *ppr { - Ok(_) => { + PacketParserResult::Some(_) => { forget(ppr); ptr::null_mut() } - Err(eof) => box_raw!(eof), + PacketParserResult::EOF(eof) => box_raw!(eof), } } |