X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a1557c4c2f3905fd760dbac16cba5be890948634..385f398740895f512abc90ea5a00a9be82bf115b:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index 0f998fe1..95050f55 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -66,7 +66,7 @@ void setGraphBuf(uint8_t *buff, size_t size)
 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
-	if ( buff == NULL ) return -1;
+	if ( buff == NULL ) return 0;
 	
   uint32_t i;
   for (i=0;i<GraphTraceLen;++i){
@@ -76,29 +76,32 @@ size_t getFromGraphBuf(uint8_t *buff)
   }
   return i;
 }
+
+
 // Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
-  int clock;
-  sscanf(str, "%i", &clock);
-  if (!strcmp(str, ""))
-    clock = 0;
+	int clock;
+	sscanf(str, "%i", &clock);
+	if (!strcmp(str, ""))
+		clock = 0;
 
 	// Auto-detect clock
-  if (!clock)
-  {
-    uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+	if (!clock)
+	{
+		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
-		if ( size < 0 ) {
+		if ( size == 0 ) {
 			PrintAndLog("Failed to copy from graphbuffer");
 			return -1;
 		}
-    clock = DetectASKClock(grph,size,0);
+		clock = DetectASKClock(grph,size,0);
 		// Only print this message if we're not looping something
-    if (!verbose){
-      PrintAndLog("Auto-detected clock rate: %d", clock);
-    }
-  return clock;
+		if (!verbose){
+			PrintAndLog("Auto-detected clock rate: %d", clock);
+		}
+	}
+	return clock;
 }
 
 // A simple test to see if there is any data inside Graphbuffer. 
@@ -145,6 +148,10 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 	{
 		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
+		if ( size == 0 ) {
+			PrintAndLog("Failed to copy from graphbuffer");
+			return -1;
+		}
 		clock = DetectpskNRZClock(grph,size,0);
 		// Only print this message if we're not looping something
 		if (!verbose){
@@ -152,4 +159,4 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 		}
 	}
 	return clock;
-}
\ No newline at end of file
+}