Merge pull request #50 from iceman1001/master

FIX:  warnings on gcc v7.2 ubuntu
This commit is contained in:
Romuald Conty 2018-01-31 18:42:19 +01:00 committed by GitHub
commit 519e475b09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View file

@ -910,7 +910,7 @@ get_rats_is_2k(mftag t, mfreader r)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (res >= 10) { if (res >= 10) {
printf("ATS %02X%02X%02X%02X%02X|%02X%02X%02X%02X\n", res, abtRx[0], abtRx[1], abtRx[2], abtRx[3], abtRx[4], abtRx[5], abtRx[6], abtRx[7], abtRx[8]); printf("ATS %02X%02X%02X%02X%02X|%02X%02X%02X%02X%02X\n", res, abtRx[0], abtRx[1], abtRx[2], abtRx[3], abtRx[4], abtRx[5], abtRx[6], abtRx[7], abtRx[8]);
return ((abtRx[5] == 0xc1) && (abtRx[6] == 0x05) return ((abtRx[5] == 0xc1) && (abtRx[6] == 0x05)
&& (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f) && (abtRx[7] == 0x2f) && (abtRx[8] == 0x2f)
&& ((t.nt.nti.nai.abtAtqa[1] & 0x02) == 0x00)); && ((t.nt.nti.nai.abtAtqa[1] & 0x02) == 0x00));

View file

@ -32,9 +32,13 @@
#endif #endif
#ifdef SLRE_DEBUG #ifdef SLRE_DEBUG
# ifndef DBG
# define DBG(x) printf x # define DBG(x) printf x
# endif DBG
#else #else
# ifndef DBG
# define DBG(x) # define DBG(x)
# endif DBG
#endif #endif
struct bracket_pair { struct bracket_pair {