[pkg-opensc-commit] [opensc] 116/295: pkcs15-tool: make --list* messages consistent

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit 6cbc57a161aeb5ac3a64284fb07b434d30bf9f9b
Author: Nuno Goncalves <nunojpg at gmail.com>
Date:   Thu Nov 10 11:06:44 2016 +0100

    pkcs15-tool: make --list* messages consistent
    
    Signed-off-by: Nuno Goncalves <nunojpg at gmail.com>
---
 src/tools/pkcs15-tool.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tools/pkcs15-tool.c b/src/tools/pkcs15-tool.c
index 17c3fad..43807ae 100644
--- a/src/tools/pkcs15-tool.c
+++ b/src/tools/pkcs15-tool.c
@@ -279,7 +279,7 @@ static int list_certificates(void)
 		return 1;
 	}
 	if (verbose)
-		printf("Card has %d certificate(s).\n\n", r);
+		printf("Card has %d Certificate(s).\n\n", r);
 	for (i = 0; i < r; i++) {
 		print_cert_info(objs[i]);
 		printf("\n");
@@ -491,6 +491,8 @@ static int list_data_objects(void)
 		return 1;
 	}
 	count = r;
+	if (verbose)
+		printf("Card has %d Data object(s).\n\n", count);
 	for (i = 0; i < count; i++) {
 		int idx;
 		struct sc_pkcs15_data_info *cinfo = (struct sc_pkcs15_data_info *) objs[i]->data;
@@ -600,7 +602,7 @@ static int list_private_keys(void)
 		return 1;
 	}
 	if (verbose)
-		printf("Card has %d private key(s).\n\n", r);
+		printf("Card has %d Private key(s).\n\n", r);
 	for (i = 0; i < r; i++) {
 		print_prkey_info(objs[i]);
 		printf("\n");
@@ -679,7 +681,7 @@ static int list_public_keys(void)
 		return 1;
 	}
 	if (verbose)
-		printf("Card has %d public key(s).\n\n", r);
+		printf("Card has %d Public key(s).\n\n", r);
 	for (i = 0; i < r; i++) {
 		print_pubkey_info(objs[i]);
 		printf("\n");
@@ -1367,7 +1369,7 @@ static int list_pins(void)
 		return 1;
 	}
 	if (verbose)
-		printf("Card has %d Authentication objects.\n", r);
+		printf("Card has %d Authentication object(s).\n\n", r);
 	for (i = 0; i < r; i++) {
 		print_pin_info(objs[i]);
 		printf("\n");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git