macros: use short-circuit evaluation in NM_IN_SET()

All current users of NM_IN_SET() would rather use short-circuit evalation
(or don't care). It seems that doing it by default seems favorable.

The only downside is, that this might have somewhat unexpected behavior
to a user who expects a regular function (which would evaluate always
all arguments).

Fixes: 7860ef959ae4b244017b9dc491e9c0a6024279dd

1 files changed, 9 insertions, 7 deletions

diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h
index fe45787d2d..291dc0742a 100644
--- a/include/nm-macros-internal.h
+++ b/include/nm-macros-internal.h
@@ -159,13 +159,15 @@
 #define _NM_IN_SET_EVAL_N2(op, x, n, ...)        _NM_IN_SET_EVAL_##n(op, x, __VA_ARGS__)
 #define _NM_IN_SET_EVAL_N(op, x, n, ...)         _NM_IN_SET_EVAL_N2(op, x, n, __VA_ARGS__)
 
-/* does not do short-circuit evaluation to get a more function-like behavior
- * ("|" instead of "||"). Use NM_IN_SET_SC() if you want that */
-#define NM_IN_SET(x, ...)               _NM_IN_SET_EVAL_N(| , x, NM_NARG (__VA_ARGS__), __VA_ARGS__)
-
-/* "SC" stands for "short-cirtuit". It will only evaluate the arguments
- * until a match is found. */
-#define NM_IN_SET_SC(x, ...)            _NM_IN_SET_EVAL_N(||, x, NM_NARG (__VA_ARGS__), __VA_ARGS__)
+/* Beware that this does short-circuit evaluation (use "||" instead of "|")
+ * which has a possibly unexpected non-function-like behavior.
+ * Use NM_IN_SET_SE if you need all arguments to be evaluted. */
+#define NM_IN_SET(x, ...)               _NM_IN_SET_EVAL_N(||, x, NM_NARG (__VA_ARGS__), __VA_ARGS__)
+
+/* "SE" stands for "side-effect". Contrary to NM_IN_SET(), this does not do
+ * short-circuit evaluation, which can make a difference if the arguments have
+ * side-effects. */
+#define NM_IN_SET_SE(x, ...)            _NM_IN_SET_EVAL_N(|, x, NM_NARG (__VA_ARGS__), __VA_ARGS__)
 
 /*****************************************************************************/