Silent some compilation warnings (Fixes Issue 145)

This commit is contained in:
Romuald Conty 2011-02-10 10:38:21 +00:00
parent f272e156e8
commit 243100b676
4 changed files with 12 additions and 6 deletions

View file

@ -87,7 +87,7 @@ target_io( nfc_target_t * pnt, const byte_t * pbtInput, const size_t szInput, by
case 0x30: // Mifare read
// block address is in pbtInput[1]
*pszOutput = 15;
strcpy(pbtOutput, "You read block ");
strcpy((char*)pbtOutput, "You read block ");
pbtOutput[15] = pbtInput[1];
break;
case 0x50: // Deselect / HALT

View file

@ -113,10 +113,14 @@ write_card (void)
bool write_lock;
printf ("Write OTP bytes ? [yN] ");
fgets (buffer, BUFSIZ, stdin);
if (!fgets (buffer, BUFSIZ, stdin)) {
ERR ("Unable to read standard input.");
}
write_otp = ((buffer[0] == 'y') || (buffer[0] == 'Y'));
printf ("Write Lock bytes ? [yN] ");
fgets (buffer, BUFSIZ, stdin);
if (!fgets (buffer, BUFSIZ, stdin)) {
ERR ("Unable to read standard input.");
}
write_lock = ((buffer[0] == 'y') || (buffer[0] == 'Y'));
printf ("Writing %d pages |", uiBlocks + 1);

View file

@ -1287,6 +1287,8 @@ pn53x_target_init (nfc_device_t * pnd, nfc_target_t * pnt, byte_t * pbtRx, size_
nfc_dep_mode_t ndm = NDM_UNDEFINED;
byte_t btActivatedMode;
nm.nbr = NBR_UNDEFINED;
if(!pn53x_TgInitAsTarget(pnd, ptm, pbtMifareParams, pbtTkt, szTkt, pbtFeliCaParams, pbtNFCID3t, pbtGBt, szGBt, pbtRx, pszRx, &btActivatedMode)) {
return false;
}
@ -1648,6 +1650,8 @@ pn53x_ptt_to_nm( const pn53x_target_type_t ptt )
return (const nfc_modulation_t){ .nmt = NMT_DEP, .nbr = NBR_424 };
break;
}
// We should never be here, this line silent compilation warning
return (const nfc_modulation_t){ .nmt = NMT_ISO14443A, .nbr = NBR_106 };
}
const pn53x_target_type_t

View file

@ -358,11 +358,9 @@ acr122_firmware (const nfc_device_spec_t nds)
uiResult = SCardTransmit (pas->hCard, &(pas->ioCard), abtGetFw, sizeof (abtGetFw), NULL, (byte_t *) abtFw, (void *) &szFwLen);
}
#ifdef DEBUG
if (uiResult != SCARD_S_SUCCESS) {
printf ("No ACR122 firmware received, Error: %08x\n", uiResult);
ERR ("No ACR122 firmware received, Error: %08x", uiResult);
}
#endif
return abtFw;
}