RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-09 22:46:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed warnings on Mac OS 10.8, xcode 5

Browse source
This commit is contained in:
roel@libnfc.org 2013-09-25 10:40:16 +00:00
parent 450d2e3a96
commit 7bb9d33e2c
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/cmddata.c
View file

@ -812,7 +812,7 @@ int CmdThreshold(const char *Cmd)
if (GraphBuffer[i] >= threshold) if (GraphBuffer[i] >= threshold)
GraphBuffer[i] = 1; GraphBuffer[i] = 1;
else else
GraphBuffer[i] =- 1; GraphBuffer[i] = -1;
} }
RepaintGraphWindow(); RepaintGraphWindow();
return 0; return 0;

2
client/cmdhf14b.c
View file

@ -359,7 +359,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
if (hexout != NULL) { if (hexout != NULL) {
uint8_t first, second; uint8_t first, second;
for (int i = 0; i < resp.arg[0]; i++) { // data in hex for (int i = 0; i < resp.arg[0]; i++) { // data in hex
sprintf(&hexout[i * 3], "%02hX ", recv[i]); sprintf(&hexout[i * 3], "%02X ", recv[i]);
} }
PrintAndLog("%s", hexout); PrintAndLog("%s", hexout);
free(hexout); free(hexout);

16
client/cmdhf15.c
View file

@ -328,7 +328,7 @@ int CmdHF15DumpMem(const char*Cmd) {
*output=0; // reset outputstring *output=0; // reset outputstring
sprintf(output, "Block %2i ",blocknum); sprintf(output, "Block %2i ",blocknum);
for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
sprintf(output+strlen(output),"%02hX ",recv[i]); sprintf(output+strlen(output),"%02X ",recv[i]);
} }
strcat(output," "); strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii
@ -516,7 +516,7 @@ int CmdHF15CmdRaw (const char *cmd) {
hexout = (char *)malloc(resp.arg[0] * 3 + 1); hexout = (char *)malloc(resp.arg[0] * 3 + 1);
if (hexout != NULL) { if (hexout != NULL) {
for (int i = 0; i < resp.arg[0]; i++) { // data in hex for (int i = 0; i < resp.arg[0]; i++) { // data in hex
sprintf(&hexout[i * 3], "%02hX ", recv[i]); sprintf(&hexout[i * 3], "%02X ", recv[i]);
} }
PrintAndLog("%s", hexout); PrintAndLog("%s", hexout);
free(hexout); free(hexout);
@ -669,7 +669,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
if (!(recv[0] & ISO15_RES_ERROR)) { if (!(recv[0] & ISO15_RES_ERROR)) {
*output=0; // reset outputstring *output=0; // reset outputstring
for ( i=1; i<resp.arg[0]-2; i++) { for ( i=1; i<resp.arg[0]-2; i++) {
sprintf(output+strlen(output),"%02hX ",recv[i]); sprintf(output+strlen(output),"%02X ",recv[i]);
} }
strcat(output,"\n\r"); strcat(output,"\n\r");
strcat(output,"UID = "); strcat(output,"UID = ");
@ -679,11 +679,11 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
strcat(output,"\n\r"); strcat(output,"\n\r");
i=10; i=10;
if (recv[1] & 0x01) if (recv[1] & 0x01)
sprintf(output+strlen(output),"DSFID supported, set to %02hX\n\r",recv[i++]); sprintf(output+strlen(output),"DSFID supported, set to %02X\n\r",recv[i++]);
else else
strcat(output,"DSFID not supported\n\r"); strcat(output,"DSFID not supported\n\r");
if (recv[1] & 0x02) if (recv[1] & 0x02)
sprintf(output+strlen(output),"AFI supported, set to %03hX\n\r",recv[i++]); sprintf(output+strlen(output),"AFI supported, set to %03X\n\r",recv[i++]);
else else
strcat(output,"AFI not supported\n\r"); strcat(output,"AFI not supported\n\r");
if (recv[1] & 0x04) { if (recv[1] & 0x04) {
@ -693,7 +693,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
i+=2; i+=2;
} else } else
strcat(output,"Tag does not provide information on memory layout\n\r"); strcat(output,"Tag does not provide information on memory layout\n\r");
if (recv[1] & 0x08) sprintf(output+strlen(output),"IC reference given: %02hX\n\r",recv[i++]); if (recv[1] & 0x08) sprintf(output+strlen(output),"IC reference given: %02X\n\r",recv[i++]);
else strcat(output,"IC reference not given\n\r"); else strcat(output,"IC reference not given\n\r");
@ -770,7 +770,7 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
if (!(recv[0] & ISO15_RES_ERROR)) { if (!(recv[0] & ISO15_RES_ERROR)) {
*output=0; // reset outputstring *output=0; // reset outputstring
for ( int i=1; i<resp.arg[0]-2; i++) { for ( int i=1; i<resp.arg[0]-2; i++) {
sprintf(output+strlen(output),"%02hX ",recv[i]); sprintf(output+strlen(output),"%02X ",recv[i]);
} }
strcat(output," "); strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) { for ( int i=1; i<resp.arg[0]-2; i++) {
@ -844,7 +844,7 @@ int CmdHF15CmdRead(const char *Cmd) {
*output=0; // reset outputstring *output=0; // reset outputstring
//sprintf(output, "Block %2i ",blocknum); //sprintf(output, "Block %2i ",blocknum);
for ( int i=1; i<resp.arg[0]-2; i++) { for ( int i=1; i<resp.arg[0]-2; i++) {
sprintf(output+strlen(output),"%02hX ",recv[i]); sprintf(output+strlen(output),"%02X ",recv[i]);
} }
strcat(output," "); strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) { for ( int i=1; i<resp.arg[0]-2; i++) {

2
client/cmdhw.c
View file

@ -87,7 +87,7 @@ int CmdReset(const char *Cmd)
int CmdSetDivisor(const char *Cmd) int CmdSetDivisor(const char *Cmd)
{ {
UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}}; UsbCommand c = {CMD_SET_LF_DIVISOR, {strtol(Cmd, NULL, 0), 0, 0}};
if (c.arg[0] < 0 || c.arg[0] > 255) { if (c.arg[0] < 19 || c.arg[0] > 255) {
PrintAndLog("divisor must be between 19 and 255"); PrintAndLog("divisor must be between 19 and 255");
} else { } else {
SendCommand(&c); SendCommand(&c);

2
client/cmdlfem4x.c
View file

@ -412,7 +412,7 @@ int CmdEM4x50Read(const char *Cmd)
int CmdEM410xWrite(const char *Cmd) int CmdEM410xWrite(const char *Cmd)
{ {
uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
unsigned int card = 0xFF; // invalid card value int card = 0xFF; // invalid card value
unsigned int clock = 0; // invalid clock value unsigned int clock = 0; // invalid clock value
sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock); sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);

2
common/iso15693tools.c
View file

@ -58,7 +58,7 @@ int sprintf(char *str, const char *format, ...);
char* Iso15693sprintUID(char *target,uint8_t *uid) { char* Iso15693sprintUID(char *target,uint8_t *uid) {
static char tempbuf[2*8+1]=""; static char tempbuf[2*8+1]="";
if (target==NULL) target=tempbuf; if (target==NULL) target=tempbuf;
sprintf(target,"%02hX%02hX%02hX%02hX%02hX%02hX%02hX%02hX", sprintf(target,"%02X%02X%02X%02X%02X%02X%02X%02X",
uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]); uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]);
return target; return target;
} }