From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 May 2015 11:13:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c068ebb78f2e4070fcf1a604df0d7088374b60c6?hp=46cd801c5ad5d5f60b2526b4a1e6700a2a008f7b

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 9c17ce3c..ff9fb16a 100644
--- 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);
 
 	countblocks *= 4;
-	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(),0 , 0);
+	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 	
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 94c47072..eb2479ff 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1321,12 +1321,13 @@ int CmdHF14AMfESave(const char *Cmd)
 		// get filename (UID from memory)
 		if (mfEmlGetMem(buf, 0, 1)) {
 			PrintAndLog("Can\'t get UID from block: %d", 0);
-			len = sprintf(fnameptr, "dump"); 
+			len = sprintf(fnameptr, "dump");
 			fnameptr += len;
 		}
 		else {
 			for (j = 0; j < 7; j++, fnameptr += 2)
-				sprintf(fnameptr, "%02X", buf[j]); 
+				sprintf(fnameptr, "%02X", buf[j]);
+		}
 		}
 	} else {
 		fnameptr += len;