Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 9c17ce3cb3490b066a1f6c65d4c71d084604d256..ff9fb16a786ca20f441bb8776309f2b398ef655e 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -332,7 +332,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
 \r
        countblocks *= 4;\r
-       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(),0 , 0);\r
+       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        \r

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 94c4707206273e9fd8c25997a023db18560a944b..eb2479ff26308f61f5f5842b3c109b447a4747fa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1321,12 +1321,13 @@ int CmdHF14AMfESave(const char *Cmd)
                // get filename (UID from memory)\r
                if (mfEmlGetMem(buf, 0, 1)) {\r
                        PrintAndLog("Can\'t get UID from block: %d", 0);\r
-                       len = sprintf(fnameptr, "dump"); \r
+                       len = sprintf(fnameptr, "dump");\r
                        fnameptr += len;\r
                }\r
                else {\r
                        for (j = 0; j < 7; j++, fnameptr += 2)\r
-                               sprintf(fnameptr, "%02X", buf[j]); \r
+                               sprintf(fnameptr, "%02X", buf[j]);\r
+               }\r
                }\r
        } else {\r
                fnameptr += len;\r