From c328f6864049256f1e5dc8ffeba8e597766d449a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 1 Jan 2018 18:57:37 +0100
Subject: [PATCH] fix:  part of @pwpiwi 's #534 fixes

---
 client/cmdhf14a.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 50d1c551a..eed98bf80 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -15,7 +15,7 @@
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
-const manufactureName manufactureMapping[] = {
+static const manufactureName manufactureMapping[] = {
 	// ID,  "Vendor Country"
 	{ 0x01, "Motorola UK" },
 	{ 0x02, "ST Microelectronics SA France" },
@@ -201,7 +201,7 @@ int CmdHF14AReader(const char *Cmd) {
 			  break;
 		case 'x':
 		case 'X':
-			cm = cm - ISO14A_CONNECT;
+			cm &= ~ISO14A_CONNECT;
 			break;
 		default:
 			PrintAndLog("Unknown command.");
@@ -253,7 +253,7 @@ int CmdHF14AReader(const char *Cmd) {
 
 	PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
 	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-	PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
+	PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
 	if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
 		PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
@@ -313,7 +313,7 @@ int CmdHF14AInfo(const char *Cmd) {
 
 	PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
 	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
-	PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
+	PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
 
 	bool isMifareClassic = true;
 	switch (card.sak) {