diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-15 15:45:02 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-15 15:45:02 +0000 |
| commit | d357cdd882cc0cf6afb15686834f5d9d6efab57f (patch) | |
| tree | 0c84af11c55111d8ee2d6185d5146ba637a87f58 /src/expression.c | |
| parent | 75d2e1e6e90b087ea48f0cf0ea23a8a566d94537 (diff) | |
| parent | c3d233b1e210922ac6f29afca796b66964e499de (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/nftables.h
src/main.c
Diffstat (limited to 'src/expression.c')
| -rw-r--r-- | src/expression.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/expression.c b/src/expression.c index 71154cc6..518f71c8 100644 --- a/src/expression.c +++ b/src/expression.c @@ -356,7 +356,7 @@ const char *expr_op_symbols[] = { [OP_XOR] = "^", [OP_LSHIFT] = "<<", [OP_RSHIFT] = ">>", - [OP_EQ] = NULL, + [OP_EQ] = "==", [OP_NEQ] = "!=", [OP_LT] = "<", [OP_GT] = ">", @@ -407,7 +407,9 @@ struct expr *unary_expr_alloc(const struct location *loc, static void binop_expr_print(const struct expr *expr) { expr_print(expr->left); - if (expr_op_symbols[expr->op] != NULL) + if (expr_op_symbols[expr->op] && + (expr->op != OP_EQ || + expr->left->ops->type == EXPR_BINOP)) printf(" %s ", expr_op_symbols[expr->op]); else printf(" "); |