@@ -192,10 +192,11 @@
 #ifndef MAX_ATR_SIZE
 #define MAX_ATR_SIZE 1024
 #endif
 
 #ifdef CACKEY_DEBUG
+#  define CACKEY_DEBUG_MIN(a, b) ((a) < (b) ? (a) : (b))
 #  ifdef HAVE_TIME_H
 #    include <time.h>
 static time_t cackey_debug_start_time = 0;
 static unsigned long CACKEY_DEBUG_GETTIME(void) {
 	if (cackey_debug_start_time == 0) {
@@ -226,11 +227,11 @@
 	TMPBUF = (unsigned char *) (x); \
 	buf_user[0] = 0; \
 	buf_user[2] = 0; \
 	buf_user_p = buf_user; \
 	buf_user_size = sizeof(buf_user); \
-	for (idx = 0; idx < MIN((y), sizeof(buf_user)); idx++) { \
+	for (idx = 0; idx < CACKEY_DEBUG_MIN((y), sizeof(buf_user)); idx++) { \
 		if (buf_user_size <= 0) { \
 			break; \
 		}; \
 		snprintf_ret = snprintf(buf_user_p, buf_user_size, ", %02x", TMPBUF[idx]); \
 		if (snprintf_ret <= 0) { \
@@ -3361,11 +3362,11 @@
 static cackey_ret cackey_token_present(struct cackey_slot *slot) {
 	cackey_ret pcsc_connect_ret;
 	DWORD reader_len = 0, state = 0, protocol = 0, atr_len;
 	BYTE atr[MAX_ATR_SIZE];
 	LONG status_ret, scard_reconn_ret;
-	LPSTR *reader_name;
+	LPSTR reader_name;
 
 	CACKEY_DEBUG_PRINTF("Called.");
 
 	if (slot->internal) {
 		CACKEY_DEBUG_PRINTF("Returning token present (internal token)");