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

reuse MAX macro

Browse source
This commit is contained in:
Philippe Teuwen 2022-02-17 12:30:43 +01:00
parent c2092ee2ed
commit e67215fe49
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/src/cmdhfmf.c
View file

@ -48,11 +48,6 @@
#define MIFARE_2K_MAXSECTOR 32 #define MIFARE_2K_MAXSECTOR 32
#define MIFARE_4K_MAXSECTOR 40 #define MIFARE_4K_MAXSECTOR 40
/* On some platforms, max() may already be defined */
#ifndef max
#define max(a, b) ((a) > (b) ? (a) : (b))
#endif
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
/* /*
@ -1243,7 +1238,7 @@ static int CmdHF14AMfNested(const char *Cmd) { //TODO: single mode broken? can't
if (singleSector) { if (singleSector) {
uint8_t MinSectorsCnt = 0; uint8_t MinSectorsCnt = 0;
// find a MIFARE type that can accommodate the provided block number // find a MIFARE type that can accommodate the provided block number
uint8_t s = max(mfSectorNum(trgBlockNo), mfSectorNum(blockNo)); uint8_t s = MAX(mfSectorNum(trgBlockNo), mfSectorNum(blockNo));
if (s < MIFARE_MINI_MAXSECTOR) { if (s < MIFARE_MINI_MAXSECTOR) {
MinSectorsCnt = MIFARE_MINI_MAXSECTOR; MinSectorsCnt = MIFARE_MINI_MAXSECTOR;
} else if (s < MIFARE_1K_MAXSECTOR) { } else if (s < MIFARE_1K_MAXSECTOR) {