diff options
| author | F. Aragon <paco@voltanet.io> | 2018-09-13 17:37:08 +0200 |
|---|---|---|
| committer | F. Aragon <paco@voltanet.io> | 2018-09-13 17:37:08 +0200 |
| commit | 7fe96307ee288bd28a54ba4ddfa559a1cf07bb7f (patch) | |
| tree | 43c78be92e26fe2a6adcc231c18ba869e0fb1ccf /lib/zebra.h | |
| parent | Merge pull request #3007 from pacovn/static_analysis__shadow_variables2 (diff) | |
| download | frr-7fe96307ee288bd28a54ba4ddfa559a1cf07bb7f.tar.xz frr-7fe96307ee288bd28a54ba4ddfa559a1cf07bb7f.zip | |
bgpd lib ospf6d pbrd tests zebra: shadowing fixes
This fixes all remaining local variable shadowing cases
Signed-off-by: F. Aragon <paco@voltanet.io>
Diffstat (limited to 'lib/zebra.h')
| -rw-r--r-- | lib/zebra.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/zebra.h b/lib/zebra.h index d80aa0693..4e0e408ea 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -333,18 +333,18 @@ struct in_pktinfo { #endif #define MAX(a, b) \ ({ \ - typeof(a) _a = (a); \ - typeof(b) _b = (b); \ - _a > _b ? _a : _b; \ + typeof(a) _max_a = (a); \ + typeof(b) _max_b = (b); \ + _max_a > _max_b ? _max_a : _max_b; \ }) #ifdef MIN #undef MIN #endif #define MIN(a, b) \ ({ \ - typeof(a) _a = (a); \ - typeof(b) _b = (b); \ - _a < _b ? _a : _b; \ + typeof(a) _min_a = (a); \ + typeof(b) _min_b = (b); \ + _min_a < _min_b ? _min_a : _min_b; \ }) #ifndef offsetof |