At least cmd_error() is useful outside of evaluate.c, so collect all these macros into erec.h.
Signed-off-by: Phil Sutter <[email protected]> --- include/erec.h | 6 ++++++ src/evaluate.c | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/erec.h b/include/erec.h index 79a162902304b..fc512a622947f 100644 --- a/include/erec.h +++ b/include/erec.h @@ -75,5 +75,11 @@ extern int __fmtstring(4, 5) __stmt_binary_error(struct eval_ctx *ctx, __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) #define stmt_binary_error(ctx, s1, s2, fmt, args...) \ __stmt_binary_error(ctx, &(s1)->location, &(s2)->location, fmt, ## args) +#define chain_error(ctx, s1, fmt, args...) \ + __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) +#define monitor_error(ctx, s1, fmt, args...) \ + __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) +#define cmd_error(ctx, loc, fmt, args...) \ + __stmt_binary_error(ctx, loc, NULL, fmt, ## args) #endif /* NFTABLES_EREC_H */ diff --git a/src/evaluate.c b/src/evaluate.c index 09bb1fd37a301..358f5b7152634 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -42,13 +42,6 @@ static const char * const byteorder_names[] = { [BYTEORDER_BIG_ENDIAN] = "big endian", }; -#define chain_error(ctx, s1, fmt, args...) \ - __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) -#define monitor_error(ctx, s1, fmt, args...) \ - __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) -#define cmd_error(ctx, loc, fmt, args...) \ - __stmt_binary_error(ctx, loc, NULL, fmt, ## args) - static int __fmtstring(3, 4) set_error(struct eval_ctx *ctx, const struct set *set, const char *fmt, ...) -- 2.21.0
