From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 10 Jul 2015 14:55:48 +0000 (+0200)
Subject: p11tool: be more compact in token URL printing
X-Git-Tag: gnutls_3_4_3~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbf32cd989dc88d2d0cb5cd54096f5650ada9c98;p=thirdparty%2Fgnutls.git

p11tool: be more compact in token URL printing
---

diff --git a/src/pkcs11.c b/src/pkcs11.c
index ab2de9e9bd..effee75160 100644
--- a/src/pkcs11.c
+++ b/src/pkcs11.c
@@ -45,7 +45,7 @@ char *get_single_token_url(common_info_st * info);
 	if (url == NULL) { \
 		url = get_single_token_url(info); \
 		if (url == NULL) { \
-			fprintf(stderr, "warning: no token URL was provided for this operation; the available tokens are:\n"); \
+			fprintf(stderr, "warning: no token URL was provided for this operation; the available tokens are:\n\n"); \
 			pkcs11_token_list(out, det, info, 1); \
 			exit(1); \
 		} \
@@ -545,7 +545,7 @@ pkcs11_token_list(FILE * outfile, unsigned int detailed,
 		}
 
 		if (brief != 0) {
-			fprintf(outfile, "Token %d: %s\n", i, url);
+			fprintf(outfile, "%s\n", url);
 			goto cont;
 		} else {
 			fprintf(outfile, "Token %d:\n\tURL: %s\n", i, url);