autofs-5.1.9 - fix useless complexity in get_proximity() From: Ian Kent Andreas pointed out this unnecessary complexity in get_proximity() and after looking I couldn't find any reason for my usage and the macro isn't used anywhere else! Suggested-by: Andreas Gruenbacher Signed-off-by: Ian Kent --- CHANGELOG | 1 + lib/parse_subs.c | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0fc529f32..f53241339 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -90,6 +90,7 @@ - fix mailing list subscription address. - fix table_lookup_ino() fd reference. - fix handling of direct mount path in command handler. +- fix useless complexity in get_proximity(). 02/11/2023 autofs-5.1.9 - fix kernel mount status notification. diff --git a/lib/parse_subs.c b/lib/parse_subs.c index 1575e9998..8f071d3a2 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -41,9 +41,6 @@ static int volatile ifc_last_len = 0; #define MASK_B 0xFFFF0000 #define MASK_C 0xFFFFFF00 -/* Get numeric value of the n bits starting at position p */ -#define getbits(x, p, n) ((x >> (p + 1 - n)) & ~(~0 << n)) - #define EXPAND_LEADING_SLASH 0x0001 #define EXPAND_TRAILING_SLASH 0x0002 #define EXPAND_LEADING_DOT 0x0004 @@ -362,11 +359,11 @@ unsigned int get_proximity(struct sockaddr *host_addr) * Bit position 29 == 0 => class C. */ - if (!getbits(ia, 31, 1)) + if (!(ia & (1 << 31))) mask = MASK_A; - else if (!getbits(ia, 30, 1)) + else if (!(ia & (1 << 30))) mask = MASK_B; - else if (!getbits(ia, 29, 1)) + else if (!(ia & (1 << 29))) mask = MASK_C; else break;