X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3f84d473698a65e37504ec873905d248edef0f5d..080e1114c8f71ba53d34d274511aaac674e0fc85:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index 17aa3ae4..4c132420 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -182,21 +182,18 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
 	if (!strcmp(str, "")) 
 		clock = 0;
 
-	if (clock!=0) 
-		return clock;
+	if (clock!=0) return clock;
 	// Auto-detect clock
 	uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 	size_t size = getFromGraphBuf(grph);
 	if ( size == 0 ) {
-		if (verbose) 
-			PrintAndLog("Failed to copy from graphbuffer");
+		if (verbose) PrintAndLog("Failed to copy from graphbuffer");
 		return -1;
 	}
 	clock = DetectPSKClock(grph,size,0);
 	// Only print this message if we're not looping something
-	if (printAns){
-		PrintAndLog("Auto-detected clock rate: %d", clock);
-	}
+	if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock);
+
 	return clock;
 }
 
@@ -255,7 +252,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
 	if (size==0) return 0;
 	uint16_t ans = countFC(BitStream, size, 1); 
 	if (ans==0) {
-		if (verbose) PrintAndLog("DEBUG: No data found");
+		if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
 		return 0;
 	}
 	*fc1 = (ans >> 8) & 0xFF;
@@ -263,7 +260,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
 
 	*rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
 	if (*rf1==0) {
-		if (verbose) PrintAndLog("DEBUG: Clock detect error");
+		if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
 		return 0;
 	}
 	return 1;