mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-07-14 01:03:01 -07:00
Fix typo and gcc-7 warnings (#401)
* Fix typo in hf mf csave help * Fix gcc 7 warning: '~' on an expression of type bool [-Wbool-operation], use logical ! not instead of ~ * Fix gcc 7 warning: ‘memset’ used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size] * Fix gcc 7 warning: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]
This commit is contained in:
parent
1ece662f0f
commit
a2d058f3aa
4 changed files with 11 additions and 11 deletions
|
@ -114,9 +114,9 @@ uint8_t _select(bool x, bool y, uint8_t r)
|
|||
bool r6 = r >> 1 & 0x1;
|
||||
bool r7 = r & 0x1;
|
||||
|
||||
bool z0 = (r0 & r2) ^ (r1 & ~r3) ^ (r2 | r4);
|
||||
bool z0 = (r0 & r2) ^ (r1 & !r3) ^ (r2 | r4);
|
||||
bool z1 = (r0 | r2) ^ ( r5 | r7) ^ r1 ^ r6 ^ x ^ y;
|
||||
bool z2 = (r3 & ~r5) ^ (r4 & r6 ) ^ r7 ^ x;
|
||||
bool z2 = (r3 & !r5) ^ (r4 & r6 ) ^ r7 ^ x;
|
||||
|
||||
// The three bitz z0.. z1 are packed into a uint8_t:
|
||||
// 00000ZZZ
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue