diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-03-21 16:50:23 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-03-21 16:50:23 +0100 |
| commit | 277ca54a1cd08fe7366a29f5ee635048f95cbe31 (patch) | |
| tree | 69ac7bb7269278105941f27848581cd649dadcc9 /openpgp-ffi/src | |
| parent | fe5a468195477ffa2b70ca81349d08f591a7886a (diff) | |
openpgp: Rename `UserID::userid()` to `value()`.
- Fixes #224.
Diffstat (limited to 'openpgp-ffi/src')
| -rw-r--r-- | openpgp-ffi/src/packet/userid.rs | 4 | ||||
| -rw-r--r-- | openpgp-ffi/src/tpk.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openpgp-ffi/src/packet/userid.rs b/openpgp-ffi/src/packet/userid.rs index b8b5b854..cdcdeca6 100644 --- a/openpgp-ffi/src/packet/userid.rs +++ b/openpgp-ffi/src/packet/userid.rs @@ -19,9 +19,9 @@ pub extern "system" fn pgp_user_id_value(uid: *const Packet, let uid = ffi_param_ref!(uid); if let &Packet::UserID(ref uid) = uid { if let Some(p) = value_len { - *p = uid.userid().len(); + *p = uid.value().len(); } - uid.userid().as_ptr() + uid.value().as_ptr() } else { panic!("Not a UserID packet"); } diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs index 7643d4f7..a1ca0ebe 100644 --- a/openpgp-ffi/src/tpk.rs +++ b/openpgp-ffi/src/tpk.rs @@ -366,7 +366,7 @@ fn pgp_tpk_primary_user_id(tpk: *const TPK) { let tpk = tpk.ref_raw(); if let Some(binding) = tpk.userids().nth(0) { - ffi_return_string!(binding.userid().userid()) + ffi_return_string!(binding.userid().value()) } else { ptr::null_mut() } @@ -388,7 +388,7 @@ pub extern "system" fn pgp_user_id_binding_user_id( { let binding = ffi_param_ref!(binding); - ffi_return_maybe_string!(binding.userid().userid()) + ffi_return_maybe_string!(binding.userid().value()) } /// Returns a reference to the self-signature, if any. |