diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
| commit | 3b457d49854503807fa019d9c44a9daf6c79dba0 (patch) | |
| tree | 8c1b1e7a2443ac6cb1f1a4a561bf717cc1dd1246 /src/expression.c | |
| parent | d357cdd882cc0cf6afb15686834f5d9d6efab57f (diff) | |
| parent | 86b965bdab8dc8735c4a846ec09bfbbadfae780b (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/payload.c
Diffstat (limited to 'src/expression.c')
| -rw-r--r-- | src/expression.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/expression.c b/src/expression.c index 518f71c8..a12133c8 100644 --- a/src/expression.c +++ b/src/expression.c @@ -691,7 +691,11 @@ struct expr *mapping_expr_alloc(const struct location *loc, static void map_expr_print(const struct expr *expr) { expr_print(expr->map); - printf(" map "); + if (expr->mappings->ops->type == EXPR_SET_REF && + expr->mappings->set->datatype->type == TYPE_VERDICT) + printf(" vmap "); + else + printf(" map "); expr_print(expr->mappings); } |