Merge branch 'master' into fix_printf

diff --combined client/cmdhf14a.c
index 856d37b35c5a4182c875e2abc4cd3b8c8ac3db4a,e4b245c36e0a8e0c1802063268ca8481fd44bb77..480923d663a91f3de77531b67f2b5ddac4fcb2b9
--- 1/client/cmdhf14a.c
--- 2/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@@ -35,13 -35,8 +35,13 @@@
  static int CmdHelp(const char *Cmd);
  static int waitCmd(uint8_t iLen);
  
 +// structure and database for uid -> tagtype lookups 
 +typedef struct { 
 +      uint8_t uid;
 +      char* desc;
 +} manufactureName; 
  
 -const manufactureName manufactureMapping[] = {
 +static const manufactureName manufactureMapping[] = {
        // ID,  "Vendor Country"
        { 0x01, "Motorola UK" },
        { 0x02, "ST Microelectronics SA France" },
@@@ -159,7 -154,7 +159,7 @@@ int CmdHF14AReader(const char *Cmd) 
                        break;
                case 'x':
                case 'X':
 -                      cm = cm - ISO14A_CONNECT;
 +                      cm &= ~ISO14A_CONNECT;
                        break;
                default:
                        PrintAndLog("Unknown command.");
@@@ -197,7 -192,7 +197,7 @@@
  
                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));
                }
@@@ -249,7 -244,7 +249,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) {
@@@ -770,7 -765,7 +770,7 @@@ int CmdHF14AAPDU(const char *cmd) 
                                        return 1;
                        }
                        
-               if (isxdigit(c)) {
+               if (isxdigit((unsigned char)c)) {
                        // len = data + PCB(1b) + CRC(2b)
                        switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
                        case 1: