From 3ded0f97d32f91766a5815b6c74ca7c6ebade8bf Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 28 Dec 2017 17:56:18 +0100
Subject: [PATCH] Khorben/warnings (#519)
* Fix warnings and missing #include for <ctype.h>
* Avoid a warning in client/util.c
---
client/cmdcrc.c | 4 ++--
client/cmdhf14a.c | 3 ++-
client/cmdhfmf.c | 2 +-
client/cmdlft55xx.c | 2 +-
client/emv/cmdemv.c | 3 ++-
client/pm3_binlib.c | 2 +-
client/reveng/model.c | 2 +-
client/util.c | 8 ++++----
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 27d081b9..0ca2b8b1 100644
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -40,14 +40,14 @@ int split(char *str, char *arr[MAX_ARGS]){
int wordCnt = 0;
while(1){
- while(isspace(str[beginIndex])){
+ while(isspace((unsigned char)str[beginIndex])){
++beginIndex;
}
if(str[beginIndex] == '\0') {
break;
}
endIndex = beginIndex;
- while (str[endIndex] && !isspace(str[endIndex])){
+ while (str[endIndex] && !isspace((unsigned char)str[endIndex])){
++endIndex;
}
int len = endIndex - beginIndex;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8064724c..e4b245c3 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -16,6 +16,7 @@
#include <inttypes.h>
#include <string.h>
#include <unistd.h>
+#include <ctype.h>
#include "util.h"
#include "util_posix.h"
#include "iso14443crc.h"
@@ -764,7 +765,7 @@ int CmdHF14AAPDU(const char *cmd) {
return 1;
}
- if (isxdigit(c)) {
+ if (isxdigit((unsigned char)c)) {
// len = data + PCB(1b) + CRC(2b)
switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
case 1:
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d9578af2..5ebf8144 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1089,7 +1089,7 @@ int CmdHF14AMfChk(const char *Cmd)
if( buf[0]=='#' ) continue; //The line start with # is comment, skip
- if (!isxdigit(buf[0])){
+ if (!isxdigit((unsigned char)buf[0])){
PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);
continue;
}
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 92a00bce..c5a6dd3f 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1433,7 +1433,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
//The line start with # is comment, skip
if( buf[0]=='#' ) continue;
- if (!isxdigit(buf[0])) {
+ if (!isxdigit((unsigned char)buf[0])) {
PrintAndLog("File content error. '%s' must include 8 HEX symbols", buf);
continue;
}
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 42c8524a..c53b02af 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -8,6 +8,7 @@
// EMV commands
//-----------------------------------------------------------------------------
+#include <ctype.h>
#include "cmdemv.h"
#include "test/cryptotest.h"
@@ -69,7 +70,7 @@ int CmdHFEMVSelect(const char *cmd) {
return 1;
}
- if (isxdigit(c)) {
+ if (isxdigit((unsigned char)c)) {
switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data), &datalen)) {
case 1:
PrintAndLog("Invalid HEX value.");
diff --git a/client/pm3_binlib.c b/client/pm3_binlib.c
index ed46c8e8..cffbca6c 100644
--- a/client/pm3_binlib.c
+++ b/client/pm3_binlib.c
@@ -306,7 +306,7 @@ static int l_pack(lua_State *L) /** pack(f,...) */
sbyte = 0;
odd = 0;
}
- } else if (isspace(a[ii])) {
+ } else if (isspace((unsigned char)a[ii])) {
/* ignore */
} else {
/* err ... ignore too*/
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 2d45b2fe..5a9b6580 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -596,7 +596,7 @@ mbynam(model_t *dest, const char *key) {
uerror("cannot allocate memory for comparison string");
akey.name = uptr = ukey;
do
- *uptr++ = toupper(*key);
+ *uptr++ = toupper((unsigned char)*key);
while(*key++);
aptr = bsearch(&akey, aliases, NALIASES, sizeof(struct malias), (int (*)(const void *, const void *)) &acmp);
diff --git a/client/util.c b/client/util.c
index b7f07bde..7e6b4074 100644
--- a/client/util.c
+++ b/client/util.c
@@ -496,7 +496,7 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
return 1;
for(i = 0; i < hexcnt; i += 2) {
- if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;
sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
data[i / 2] = temp & 0xff;
@@ -518,7 +518,7 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
return 1;
for(i = 0; i < *hexcnt; i += 2) {
- if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;
sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
data[i / 2] = temp & 0xff;
@@ -543,7 +543,7 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
continue;
}
- if (isxdigit(line[indx])) {
+ if (isxdigit((unsigned char)line[indx])) {
buf[strlen(buf) + 1] = 0x00;
buf[strlen(buf)] = line[indx];
} else {
@@ -620,7 +620,7 @@ int hextobinarray(char *target, char *source)
else if (x >= 'A' && x <= 'F')
x -= 'A' - 10;
else {
- printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, source - start, start);
+ printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);
return 0;
}
// output
--
2.39.5