From ccba7c7e9fd424f80544d7590cb97f025c446c67 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Tue, 31 May 2022 00:30:17 +0200
Subject: [PATCH] Rename 'prompt' parameters to 'pinpad_prompt'.

---
 openpgp-card-sequoia/src/card.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/openpgp-card-sequoia/src/card.rs b/openpgp-card-sequoia/src/card.rs
index 7e69ba0..e121be7 100644
--- a/openpgp-card-sequoia/src/card.rs
+++ b/openpgp-card-sequoia/src/card.rs
@@ -71,8 +71,8 @@ impl<'a> Open<'a> {
         Ok(())
     }
 
-    pub fn verify_user_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> {
-        prompt();
+    pub fn verify_user_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
+        pinpad_prompt();
 
         let _ = self.opt.verify_pw1_user_pinpad()?;
         self.pw1 = true;
@@ -88,8 +88,11 @@ impl<'a> Open<'a> {
         Ok(())
     }
 
-    pub fn verify_user_for_signing_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> {
-        prompt();
+    pub fn verify_user_for_signing_pinpad(
+        &mut self,
+        pinpad_prompt: &dyn Fn(),
+    ) -> Result<(), Error> {
+        pinpad_prompt();
 
         let _ = self.opt.verify_pw1_sign_pinpad()?;
 
@@ -105,8 +108,8 @@ impl<'a> Open<'a> {
         Ok(())
     }
 
-    pub fn verify_admin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> {
-        prompt();
+    pub fn verify_admin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
+        pinpad_prompt();
 
         let _ = self.opt.verify_pw3_pinpad()?;
         self.pw3 = true;
@@ -131,8 +134,8 @@ impl<'a> Open<'a> {
         self.opt.change_pw1(old, new)
     }
 
-    pub fn change_user_pin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> {
-        prompt();
+    pub fn change_user_pin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
+        pinpad_prompt();
         self.opt.change_pw1_pinpad()
     }
 
@@ -144,8 +147,8 @@ impl<'a> Open<'a> {
         self.opt.change_pw3(old, new)
     }
 
-    pub fn change_admin_pin_pinpad(&mut self, prompt: &dyn Fn()) -> Result<(), Error> {
-        prompt();
+    pub fn change_admin_pin_pinpad(&mut self, pinpad_prompt: &dyn Fn()) -> Result<(), Error> {
+        pinpad_prompt();
         self.opt.change_pw3_pinpad()
     }