FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHex...

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index a3590a397f1f3f7eac8065e7f9f7519af5b05333..4adc4e701866f4d86628211a764da761e8734266 100644 (file)
--- 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);
 }
 
@@ -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;