From: Alan T. DeKok Date: Fri, 18 Nov 2022 13:50:50 +0000 (-0500) Subject: make use-specific variables X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81847aca1cf50b133107ef00717537736f42a77c;p=thirdparty%2Ffreeradius-server.git make use-specific variables so we can do nested loops with fr_pair_list_foreach() macros --- diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h index 7106f562da0..ab7013f900f 100644 --- a/src/lib/util/pair.h +++ b/src/lib/util/pair.h @@ -256,7 +256,7 @@ static inline bool vp_da_data_type_check(fr_pair_t *vp) * Will be declared in the scope of the loop. */ #define fr_pair_list_foreach(_list_head, _iter) \ - for (fr_pair_t *_next, *_iter = fr_pair_list_head(_list_head); _next = fr_pair_list_next(_list_head, _iter), _iter != NULL; _iter = _next) + for (fr_pair_t *JOIN(_next,_iter), *_iter = fr_pair_list_head(_list_head); JOIN(_next,_iter) = fr_pair_list_next(_list_head, _iter), _iter != NULL; _iter = JOIN(_next,_iter)) /** Append a pair to a list, assigning its value. *