1 files changed, 22 insertions, 20 deletions

diff --git a/tests/pkcs11/pkcs11-token-raw.c b/tests/pkcs11/pkcs11-token-raw.c
index 04ff12df39..1c2b4d3d5d 100644
--- a/tests/pkcs11/pkcs11-token-raw.c
+++ b/tests/pkcs11/pkcs11-token-raw.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -44,20 +44,19 @@
 
 #if defined(HAVE___REGISTER_ATFORK)
 
-#ifdef _WIN32
-# define P11LIB "libpkcs11mock1.dll"
-#else
-# include <dlfcn.h>
-# define P11LIB "libpkcs11mock1.so"
-#endif
-
+# ifdef _WIN32
+#  define P11LIB "libpkcs11mock1.dll"
+# else
+#  include <dlfcn.h>
+#  define P11LIB "libpkcs11mock1.so"
+# endif
 
 static void tls_log_func(int level, const char *str)
 {
 	fprintf(stderr, "|<%d>| %s", level, str);
 }
 
-#define TOKEN_NAME "whatever"
+# define TOKEN_NAME "whatever"
 void doit(void)
 {
 	int ret;
@@ -95,34 +94,34 @@ void doit(void)
 	}
 
 	{
-		static const char url[] = "pkcs11:token="TOKEN_NAME;
+		static const char url[] = "pkcs11:token=" TOKEN_NAME;
 
 		/* Testing a too small buffer */
 		size_t size = 1;
 		char *buf = gnutls_malloc(size);
 		assert(buf != NULL);
 		ret = gnutls_pkcs11_token_get_info(url,
-			GNUTLS_PKCS11_TOKEN_LABEL,
-			buf, &size);
+						   GNUTLS_PKCS11_TOKEN_LABEL,
+						   buf, &size);
 		assert(ret == GNUTLS_E_SHORT_MEMORY_BUFFER);
-		assert(size == strlen(TOKEN_NAME)+1);
+		assert(size == strlen(TOKEN_NAME) + 1);
 
 		/* Testing a too small buffer by one */
 		size -= 1;
 		buf = gnutls_realloc(buf, size);
 		assert(buf != NULL);
 		ret = gnutls_pkcs11_token_get_info(url,
-			GNUTLS_PKCS11_TOKEN_LABEL,
-			buf, &size);
+						   GNUTLS_PKCS11_TOKEN_LABEL,
+						   buf, &size);
 		assert(ret == GNUTLS_E_SHORT_MEMORY_BUFFER);
-		assert(size == strlen(TOKEN_NAME)+1);
+		assert(size == strlen(TOKEN_NAME) + 1);
 
 		/* Testing an exactly fitting buffer */
 		buf = gnutls_realloc(buf, size);
 		assert(buf != NULL);
 		ret = gnutls_pkcs11_token_get_info(url,
-			GNUTLS_PKCS11_TOKEN_LABEL,
-			buf, &size);
+						   GNUTLS_PKCS11_TOKEN_LABEL,
+						   buf, &size);
 		assert(ret == 0);
 		assert(strcmp(buf, TOKEN_NAME) == 0);
 		assert(size == strlen(TOKEN_NAME));
@@ -130,10 +129,13 @@ void doit(void)
 		gnutls_free(buf);
 	}
 
-	ret = gnutls_pkcs11_token_get_ptr("pkcs11:token=invalid", (void**)&mod, &slot_id, 0);
+	ret =
+	    gnutls_pkcs11_token_get_ptr("pkcs11:token=invalid", (void **)&mod,
+					&slot_id, 0);
 	assert(ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE);
 
-	ret = gnutls_pkcs11_token_get_ptr("pkcs11:", (void**)&mod, &slot_id, 0);
+	ret =
+	    gnutls_pkcs11_token_get_ptr("pkcs11:", (void **)&mod, &slot_id, 0);
 	if (ret < 0) {
 		fail("%d: %s\n", ret, gnutls_strerror(ret));
 		exit(1);