github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 02:26:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Khorben/warnings (#519)

Browse source 
* Fix warnings and missing #include for <ctype.h>
* Avoid a warning in client/util.c
This commit is contained in:
Pierre Pronchery 2017-12-28 17:56:18 +01:00 • committed by pwpiwi
commit 3ded0f97d3
8 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdcrc.c
View file

@ -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;

3
client/cmdhf14a.c
View file

@ -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:

2
client/cmdhfmf.c
View file

@ -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;
}

2
client/cmdlft55xx.c
View file

@ -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;
}

3
client/emv/cmdemv.c
View file

@ -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.");

2
client/pm3_binlib.c
View file

@ -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*/

2
client/reveng/model.c
View file

@ -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);

8
client/util.c
View file

@ -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