summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2020-01-03 11:43:55 +0100
committerWerner Koch <wk@gnupg.org>2020-01-03 11:43:55 +0100
commitc0625c15c1fb6d06202669eb8caff2710377952d (patch)
treeee066f3d1cf4fcca2c466b4b9373241f97a25cf3
parentkbx: Initial support for an SQLite backend (diff)
downloadgnupg2-c0625c15c1fb6d06202669eb8caff2710377952d.tar.xz
gnupg2-c0625c15c1fb6d06202669eb8caff2710377952d.zip
scd: Minor fix for readibility.
* scd/command.c (open_card_with_request): Use NULL instead of APPTYPE_NULL. -- Using the enum is wrong because a string is expected. However it did harm anything because the value of the enum is 0 and thus equivalent to NULL. Signed-off-by: Werner Koch <wk@gnupg.org>
-rw-r--r--g10/skclist.c2
-rw-r--r--scd/app.c2
-rw-r--r--scd/command.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/g10/skclist.c b/g10/skclist.c
index c13566e2b..469591cc4 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -293,7 +293,7 @@ build_sk_list (ctrl_t ctrl,
* --default-key and --try-secret-key). Use the following procedure:
*
* 1) Initialize a void pointer to NULL
- * 2) Pass a reference to this pointer to this function (content)
+ * 2) Pass a reference to this pointer to this function (context)
* and provide space for the secret key (sk)
* 3) Call this function as long as it does not return an error (or
* until you are done). The error code GPG_ERR_EOF indicates the
diff --git a/scd/app.c b/scd/app.c
index 0fc155293..633070e9c 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -788,7 +788,7 @@ select_additional_application_internal (card_t card, apptype_t req_apptype)
/* Add all possible additional applications to the card context but do
- * not change the current one. This current works only for Yubikeys. */
+ * not change the current one. This currently works only for Yubikeys. */
static gpg_error_t
select_all_additional_applications_internal (card_t card)
{
diff --git a/scd/command.c b/scd/command.c
index e5cf98fcb..3d82469af 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -263,7 +263,7 @@ open_card_with_request (ctrl_t ctrl,
err = select_application (ctrl, apptypestr, &ctrl->card_ctx, 1,
serialno_bin, serialno_bin_len);
if (!err && opt_all)
- err = select_additional_application (ctrl, APPTYPE_NONE);
+ err = select_additional_application (ctrl, NULL);
leave:
xfree (serialno_bin);