diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-06-04 22:56:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-06-08 08:24:10 +0200 |
| commit | 2c3abc7bcbd3b10a204a2730134e35d61bf84f0e (patch) | |
| tree | d403af742f798a08a187b0c937f1511c1cd74170 | |
| parent | bea061affcbc00b15eeba2ec69a67d35aaac2d49 (diff) | |
| download | NetworkManager-2c3abc7bcbd3b10a204a2730134e35d61bf84f0e.tar.gz | |
std-aux,glib-aux: move NM_NARG() and _NM_MACRO_CALL() to lib-std-aux
| -rw-r--r-- | src/libnm-glib-aux/nm-macros-internal.h | 71 | ||||
| -rw-r--r-- | src/libnm-std-aux/nm-std-aux.h | 71 |
2 files changed, 71 insertions, 71 deletions
diff --git a/src/libnm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h index 48093def2a..60df686bd4 100644 --- a/src/libnm-glib-aux/nm-macros-internal.h +++ b/src/libnm-glib-aux/nm-macros-internal.h @@ -163,77 +163,6 @@ _nm_auto_freev(gpointer ptr) /*****************************************************************************/ -/* clang-format off */ -#define _NM_MACRO_SELECT_ARG_120(_empty, \ - _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ - _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, \ - _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, \ - _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, \ - _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, \ - _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, \ - _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, \ - _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, \ - _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, \ - _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, \ - _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, \ - _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, \ - N, \ - ...) \ - N - -#define NM_NARG(...) \ - _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ - 120, \ - 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, \ - 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, \ - 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, \ - 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, \ - 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, \ - 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, \ - 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, \ - 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, \ - 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, \ - 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, \ - 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \ - 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) -#define NM_NARG_MAX1(...) \ - _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ - 1, \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 110 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 100 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 90 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 80 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 70 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 60 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 50 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 40 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 30 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 20 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 10 */ \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) -#define NM_NARG_MAX2(...) \ - _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ - 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 110 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 100 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 90 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 80 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 70 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 60 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 50 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 40 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 30 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 20 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 10 */ \ - 2, 2, 2, 2, 2, 2, 2, 2, 1, 0) -/* clang-format on */ - -/*****************************************************************************/ - -#define _NM_MACRO_CALL(macro, ...) macro(__VA_ARGS__) - -/*****************************************************************************/ - #define _NM_MACRO_COMMA_IF_ARGS(...) \ _NM_MACRO_CALL(G_PASTE(__NM_MACRO_COMMA_IF_ARGS_, NM_NARG_MAX1(__VA_ARGS__)), __VA_ARGS__) #define __NM_MACRO_COMMA_IF_ARGS_0() diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h index d5cc696f82..3311137dc6 100644 --- a/src/libnm-std-aux/nm-std-aux.h +++ b/src/libnm-std-aux/nm-std-aux.h @@ -408,6 +408,77 @@ nm_streq0(const char *s1, const char *s2) /*****************************************************************************/ +/* clang-format off */ +#define _NM_MACRO_SELECT_ARG_120(_empty, \ + _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ + _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, \ + _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, \ + _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, \ + _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, \ + _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, \ + _61, _62, _63, _64, _65, _66, _67, _68, _69, _70, \ + _71, _72, _73, _74, _75, _76, _77, _78, _79, _80, \ + _81, _82, _83, _84, _85, _86, _87, _88, _89, _90, \ + _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, \ + _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, \ + _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, \ + N, \ + ...) \ + N + +#define NM_NARG(...) \ + _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ + 120, \ + 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, \ + 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, \ + 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, \ + 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, \ + 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, \ + 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, \ + 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, \ + 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, \ + 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, \ + 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, \ + 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \ + 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) +#define NM_NARG_MAX1(...) \ + _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ + 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 110 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 100 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 90 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 80 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 70 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 60 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 50 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 40 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 30 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 20 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 10 */ \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) +#define NM_NARG_MAX2(...) \ + _NM_MACRO_SELECT_ARG_120(, ##__VA_ARGS__, \ + 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 110 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 100 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 90 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 80 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 70 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 60 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 50 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 40 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 30 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 20 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 10 */ \ + 2, 2, 2, 2, 2, 2, 2, 2, 1, 0) +/* clang-format on */ + +/*****************************************************************************/ + +#define _NM_MACRO_CALL(macro, ...) macro(__VA_ARGS__) + +/*****************************************************************************/ + #define _NM_IN_SET_EVAL_1(op, _x, y) (_x == (y)) #define _NM_IN_SET_EVAL_2(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_1(op, _x, __VA_ARGS__) #define _NM_IN_SET_EVAL_3(op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_2(op, _x, __VA_ARGS__) |