matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: don't shadow _once in frr_with_mutex

Browse source 
The `_once` loop variable will result in a `-Wshadow` warning when that
is turned on.  Use `__COUNTER__` to give these variables distinct names,
like is already done with `_mtx_`.

(and because I touched it, clang-format wants it reformatted... ohwell.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2025-01-28 02:58:09 +01:00 committed by Mark Stapp
parent 05446a2961
commit d683c4d8de
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/frr_pthread.h
View file

@ -233,11 +233,13 @@ int frr_pthread_non_controlled_startup(pthread_t thread, const char *name,
unused, cleanup(_frr_mtx_unlock))) = _frr_mtx_lock(mutex), \ unused, cleanup(_frr_mtx_unlock))) = _frr_mtx_lock(mutex), \
/* end */ /* end */
#define frr_with_mutex(...) \ #define _frr_with_mutex_once(_once, ...) \
for (pthread_mutex_t MACRO_REPEAT(_frr_with_mutex, ##__VA_ARGS__) \ for (pthread_mutex_t MACRO_REPEAT(_frr_with_mutex, ##__VA_ARGS__)*_once = NULL; \
*_once = NULL; _once == NULL; _once = (void *)1) \ _once == NULL; _once = (void *)1) \
/* end */ /* end */
#define frr_with_mutex(...) _frr_with_mutex_once(NAMECTR(_once_), __VA_ARGS__)
/* variant 2: /* variant 2:
* (more suitable for long blocks, no extra indentation) * (more suitable for long blocks, no extra indentation)
* *