From 5e9d59fe2a1f686a620fbe97161a41ad6939b762 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 19 Feb 2017 01:34:45 +0100
Subject: [PATCH] syntax sugar

---
 client/cmddata.c    | 21 ++++++++++-----------
 client/cmdlfem4x.c  |  8 ++++----
 client/cmdlft55xx.c |  1 +
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/cmddata.c b/client/cmddata.c
index a75f2ec0..fe22aa4b 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1757,9 +1757,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {
-	int invert=0;
-	int clk=0;
-	int maxErr=100;
+	int invert = 0, clk = 0, maxErr = 100;
 	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
 	if (clk==1){
 		invert=1;
@@ -1769,25 +1767,26 @@ int PSKDemod(const char *Cmd, bool verbose)
 		if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
 		return 0;
 	}
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (BitLen==0) return 0;
-	uint8_t carrier=countFC(BitStream, BitLen, 0);
+	
+	uint8_t carrier = countFC(BitStream, BitLen, 0);
 	if (carrier!=2 && carrier!=4 && carrier!=8){
 		//invalid carrier
 		return 0;
 	}
-	if (g_debugMode){
-		PrintAndLog("Carrier: rf/%d",carrier);
-	}
+	
+	if (g_debugMode) PrintAndLog("Carrier: rf/%d",carrier);
+
 	int errCnt=0;
 	errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
-		if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
 	} 
 	if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
 	}
 	if (verbose || g_debugMode){
@@ -1797,7 +1796,7 @@ int PSKDemod(const char *Cmd, bool verbose)
 		}
 	}
 	//prime demod buffer for output
-	setDemodBuf(BitStream,BitLen,0);
+	setDemodBuf(BitStream, BitLen, 0);
 	return 1;
 }
 
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c2e8b7b4..a0cc060b 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -774,14 +774,14 @@ int CmdEM4x05Dump(const char *Cmd) {
 	// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
 	pwd = param_get32ex(Cmd, 0, 1, 16);
 	
-	if ( pwd != 1 ) {
+	if ( pwd != 1 )
 		usePwd = true;
-	}
+
 	int success = 1;
 	for (; addr < 16; addr++) {
 		if (addr == 2) {
 			if (usePwd) {
-				PrintAndLog("PWD Address %02u | %08X",addr,pwd);
+				PrintAndLog("PWD Address %02u | %08X", addr, pwd);
 			} else {
 				PrintAndLog("PWD Address 02 | cannot read");
 			}
@@ -792,7 +792,7 @@ int CmdEM4x05Dump(const char *Cmd) {
 
 	return success;
 }
-
+//ICEMAN;  mentalnote to self: -1 is not doable for uint32_t..
 int CmdEM4x05Read(const char *Cmd) {
 	int addr, pwd;
 	bool usePwd = false;
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 1b005d96..5b650b30 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -615,6 +615,7 @@ bool tryDetectModulation(){
 				tests[hits].ST = FALSE;
 				++hits;
 			}
+			//ICEMAN: are these PSKDemod calls needed?
 			// PSK2 - needs a call to psk1TOpsk2.
 			if ( PSKDemod("0 0 6", FALSE)) {
 				psk1TOpsk2(DemodBuffer, DemodBufferLen);
-- 
2.39.2