Fix typos.

4 files changed, 8 insertions, 8 deletions

diff --git a/ffi/include/sequoia/openpgp.h b/ffi/include/sequoia/openpgp.h
index 5a3f0e12..c2702c95 100644
--- a/ffi/include/sequoia/openpgp.h
+++ b/ffi/include/sequoia/openpgp.h
@@ -43,7 +43,7 @@ char *sq_keyid_to_string (const sq_keyid_t fp);
 /*/
 /// Converts the KeyID to a hexadecimal number.
 /*/
-char *sq_keyid_to_hex (const sq_keyid_t fp);
+char *sq_keyid_to_hex (const sq_keyid_t keyid);
 
 /*/
 /// Compares KeyIDs.
diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs
index 7dd9f8b5..99291574 100644
--- a/ffi/src/lib.rs
+++ b/ffi/src/lib.rs
@@ -85,7 +85,7 @@ use std::hash::BuildHasher;
 ///
 /// Evaluates the given expression.  On success, evaluate to
 /// `Status.Success`.  On failure, stashes the error in the context and
-/// evaluate to the appropriate Status code.
+/// evaluates to the appropriate Status code.
 macro_rules! fry_status {
     ($ctx:expr, $expr:expr) => {
         match $expr {
diff --git a/ffi/src/openpgp.rs b/ffi/src/openpgp.rs
index dba14a60..8d1486e4 100644
--- a/ffi/src/openpgp.rs
+++ b/ffi/src/openpgp.rs
@@ -1252,20 +1252,20 @@ pub extern "system" fn sq_tpk_builder_generate
 #[no_mangle]
 pub extern "system" fn sq_tsk_new(ctx: Option<&mut Context>,
                                   primary_uid: *const c_char,
-                                  tpk_out: Option<&mut *mut TSK>,
+                                  tsk_out: Option<&mut *mut TSK>,
                                   revocation_out: Option<&mut *mut Signature>)
-                                  -> Status
+    -> Status
 {
     let ctx = ctx.expect("CONTEXT is NULL");
     assert!(!primary_uid.is_null());
-    let tpk_out = tpk_out.expect("TPK is NULL");
+    let tsk_out = tsk_out.expect("TSK is NULL");
     let revocation_out = revocation_out.expect("REVOCATION is NULL");
     let primary_uid = unsafe {
         CStr::from_ptr(primary_uid)
     };
     match TSK::new(primary_uid.to_string_lossy()) {
-        Ok((tpk, revocation)) => {
-            *tpk_out = box_raw!(tpk);
+        Ok((tsk, revocation)) => {
+            *tsk_out = box_raw!(tsk);
             *revocation_out = box_raw!(revocation);
             Status::Success
         },
diff --git a/ffi/src/store.rs b/ffi/src/store.rs
index f54eab59..0197faa9 100644
--- a/ffi/src/store.rs
+++ b/ffi/src/store.rs
@@ -123,7 +123,7 @@ pub extern "system" fn sq_store_server_log(ctx: Option<&mut Context>)
 
 /// Returns the next key.
 ///
-/// Returns `NULL` on exhaustion.  If `fpp` is not `NULL`, the keys
+/// Returns `NULL` on exhaustion.  If `fpp` is not `NULL`, the key's
 /// fingerprint is stored there.
 #[no_mangle]
 pub extern "system" fn sq_key_iter_next(iter: Option<&mut KeyIter>,