X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1cc80785e55ed476b817b806ea8d6028367a4f7e..905c55de2bbe642412b47ed4e92344096c817fac:/client/util.c

diff --git a/client/util.c b/client/util.c
index 76c8d6d8..4adc4e70 100644
--- a/client/util.c
+++ b/client/util.c
@@ -75,7 +75,7 @@ void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
 	char buf[20] = {0};
 	memset(buf, 0x00, sizeof(buf));
 	//sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
-	sprintf(buf, "%012"llx"", data);
+	sprintf(buf, "%012" PRIx64 "", data);
 	AddLogLine(fileName, extData, buf);
 }
 
@@ -144,11 +144,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 	
 	// make sure we don't go beyond our char array memory
 	size_t in_index = 0, out_index = 0;
-	int max_len;	
+	int rowlen;	
 	if (breaks==0)
-		max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+		rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
 	else
-		max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+		rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
 
 	static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
 	//clear memory
@@ -156,11 +156,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 	char *tmp = buf;
 
 	// loop through the out_index to make sure we don't go too far
-	for (out_index=0; out_index < max_len-2; out_index++) {
+	for (out_index=0; out_index < rowlen-1; out_index++) {
 		// set character
-		sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+		sprintf(tmp++, "%u", data[in_index]);
 		// check if a line break is needed and we have room to print it in our array
-		if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
+		if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {
 			// increment and print line break
 			out_index++;
 			sprintf(tmp++, "%s","\n");
@@ -168,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 		in_index++;
 	}
 	// last char.
-	sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+	sprintf(tmp++, "%u", data[in_index]);
 	return buf;
 }
 
@@ -376,7 +376,8 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {
-	int bg, en, temp, i;
+	int bg, en, i;
+	uint32_t temp;
 
 	if (hexcnt & 1) return 1;
 	
@@ -395,7 +396,8 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 }
 int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 {
-	int bg, en, temp, i;
+	int bg, en, i;
+	uint32_t temp;
 
 	//if (hexcnt % 2)
 	//	return 1;