utils: Cover for missing newline after BUG() messages

Relieve callers from having to suffix their messages with a newline
escape sequence, have the macro append it to the format string instead.

This is mostly a fix for (the many) calls to BUG() without a newline
suffix. Adjust the previously correct ones since they emit an extra
newline now.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/utils.h b/include/utils.h
index 16b9426455ea033ac79c29a13cce5926b0b020cd..6a0e494607c93addcc3ead69430c0c8ab22ac220 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -32,7 +32,7 @@
 #define __must_check           __attribute__((warn_unused_result))
 #define __noreturn             __attribute__((__noreturn__))
 
-#define BUG(fmt, arg...)       ({ fprintf(stderr, "BUG: " fmt, ##arg); assert(0); abort(); })
+#define BUG(fmt, arg...)       ({ fprintf(stderr, "BUG: " fmt "\n", ##arg); assert(0); abort(); })
 
 #define BUILD_BUG_ON(condition)        ((void)sizeof(char[1 - 2*!!(condition)]))
 #define BUILD_BUG_ON_ZERO(e)   (sizeof(char[1 - 2 * !!(e)]) - 1)

diff --git a/src/datatype.c b/src/datatype.c
index 8e93ead0e8f3616dd97f0d70bcff3fc10e0890a4..fac4eb9cdcecdd6e2bb4e2e6cd27ffbf613075fa 100644 (file)
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -119,7 +119,7 @@ void datatype_print(const struct expr *expr, struct output_ctx *octx)
                                                       false, octx);
        } while ((dtype = dtype->basetype));
 
-       BUG("datatype %s has no print method or symbol table\n",
+       BUG("datatype %s has no print method or symbol table",
            expr->dtype->name);
 }
 

diff --git a/src/erec.c b/src/erec.c
index fe66abbe3ac29c9cb2e5ef338874973bc376940b..8f480a80a0d0caa4859f901b5d75fb71b33293b5 100644 (file)
--- a/src/erec.c
+++ b/src/erec.c
@@ -156,7 +156,7 @@ void erec_print(struct output_ctx *octx, const struct error_record *erec,
        case INDESC_NETLINK:
                break;
        default:
-               BUG("invalid input descriptor type %u\n", indesc->type);
+               BUG("invalid input descriptor type %u", indesc->type);
        }
 
        f = octx->error_fp;

diff --git a/src/evaluate.c b/src/evaluate.c
index b984ae4f89b551826724e09f97025d7c3c9f04fc..5a5e6cb5b288561468bd58a6aa80a3dba2cbb841 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -172,7 +172,7 @@ static enum ops byteorder_conversion_op(struct expr *expr,
        default:
                break;
        }
-       BUG("invalid byte order conversion %u => %u\n",
+       BUG("invalid byte order conversion %u => %u",
            expr->byteorder, byteorder);
 }
 
@@ -587,7 +587,7 @@ static int expr_evaluate_bits(struct eval_ctx *ctx, struct expr **exprp)
                                          &extra_len);
                break;
        default:
-               BUG("Unknown expression %s\n", expr_name(expr));
+               BUG("Unknown expression %s", expr_name(expr));
        }
 
        masklen = len + shift;
@@ -1375,7 +1375,7 @@ static int expr_evaluate_unary(struct eval_ctx *ctx, struct expr **expr)
                byteorder = BYTEORDER_HOST_ENDIAN;
                break;
        default:
-               BUG("invalid unary operation %u\n", unary->op);
+               BUG("invalid unary operation %u", unary->op);
        }
 
        __datatype_set(unary, datatype_clone(arg->dtype));
@@ -1426,7 +1426,7 @@ static int constant_binop_simplify(struct eval_ctx *ctx, struct expr **expr)
                mpz_rshift_ui(val, mpz_get_uint32(right->value));
                break;
        default:
-               BUG("invalid binary operation %u\n", op->op);
+               BUG("invalid binary operation %u", op->op);
        }
 
        new = constant_expr_alloc(&op->location, op->dtype, op->byteorder,
@@ -1615,7 +1615,7 @@ static int expr_evaluate_binop(struct eval_ctx *ctx, struct expr **expr)
                ret = expr_evaluate_bitwise(ctx, expr);
                break;
        default:
-               BUG("invalid binary operation %u\n", op->op);
+               BUG("invalid binary operation %u", op->op);
        }
 
 
@@ -2053,7 +2053,7 @@ static int interval_set_eval(struct eval_ctx *ctx, struct set *set,
        case CMD_RESET:
                break;
        default:
-               BUG("unhandled op %d\n", ctx->cmd->op);
+               BUG("unhandled op %d", ctx->cmd->op);
                break;
        }
 
@@ -2278,7 +2278,7 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr)
                        return -1;
 
                if (ectx.len && mappings->set->data->len != ectx.len)
-                       BUG("%d vs %d\n", mappings->set->data->len, ectx.len);
+                       BUG("%d vs %d", mappings->set->data->len, ectx.len);
 
                map->mappings = mappings;
 
@@ -2643,7 +2643,7 @@ static int binop_transfer_one(struct eval_ctx *ctx,
                                            *right, expr_get(left->right));
                break;
        default:
-               BUG("invalid binary operation %u\n", left->op);
+               BUG("invalid binary operation %u", left->op);
        }
 
        return expr_evaluate(ctx, right);
@@ -2965,7 +2965,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr)
                                                 "Use concatenations with sets and maps, not singleton values");
                        break;
                default:
-                       BUG("invalid expression type %s\n", expr_name(right));
+                       BUG("invalid expression type %s", expr_name(right));
                }
                break;
        case OP_LT:
@@ -2996,7 +2996,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr)
                        return -1;
                break;
        default:
-               BUG("invalid relational operation %u\n", rel->op);
+               BUG("invalid relational operation %u", rel->op);
        }
 
        if (binop_transfer(ctx, expr) < 0)
@@ -3232,7 +3232,7 @@ static int expr_evaluate(struct eval_ctx *ctx, struct expr **expr)
        case EXPR_RANGE_SYMBOL:
                return expr_evaluate_symbol_range(ctx, expr);
        default:
-               BUG("unknown expression type %s\n", expr_name(*expr));
+               BUG("unknown expression type %s", expr_name(*expr));
        }
 }
 
@@ -3393,7 +3393,7 @@ static int stmt_evaluate_verdict(struct eval_ctx *ctx, struct stmt *stmt)
        case EXPR_MAP:
                break;
        default:
-               BUG("invalid verdict expression %s\n", expr_name(stmt->expr));
+               BUG("invalid verdict expression %s", expr_name(stmt->expr));
        }
        return 0;
 }
@@ -5094,7 +5094,7 @@ int stmt_evaluate(struct eval_ctx *ctx, struct stmt *stmt)
        case STMT_OPTSTRIP:
                return stmt_evaluate_optstrip(ctx, stmt);
        default:
-               BUG("unknown statement type %d\n", stmt->type);
+               BUG("unknown statement type %d", stmt->type);
        }
 }
 
@@ -5485,7 +5485,7 @@ static struct expr *expr_set_to_list(struct eval_ctx *ctx, struct expr *dev_expr
                        expr = key;
                        break;
                default:
-                       BUG("invalid expression type %s\n", expr_name(expr));
+                       BUG("invalid expression type %s", expr_name(expr));
                        break;
                }
 
@@ -5537,7 +5537,7 @@ static bool evaluate_device_expr(struct eval_ctx *ctx, struct expr **dev_expr)
                case EXPR_VALUE:
                        break;
                default:
-                       BUG("invalid expression type %s\n", expr_name(expr));
+                       BUG("invalid expression type %s", expr_name(expr));
                        break;
                }
 
@@ -5977,7 +5977,7 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
                handle_merge(&cmd->object->handle, &cmd->handle);
                return obj_evaluate(ctx, cmd->object);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -6148,7 +6148,7 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd)
                obj_del_cache(ctx, cmd, NFT_OBJECT_TUNNEL);
                return 0;
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -6158,7 +6158,7 @@ static int cmd_evaluate_get(struct eval_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_ELEMENTS:
                return setelem_evaluate(ctx, cmd);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -6313,7 +6313,7 @@ static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd)
                }
                return 0;
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -6342,7 +6342,7 @@ static int cmd_evaluate_reset(struct eval_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_MAP:
                return cmd_evaluate_list(ctx, cmd);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -6422,7 +6422,7 @@ static int cmd_evaluate_flush(struct eval_ctx *ctx, struct cmd *cmd)
 
                return 0;
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -6444,7 +6444,7 @@ static int cmd_evaluate_rename(struct eval_ctx *ctx, struct cmd *cmd)
 
                break;
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -6634,5 +6634,5 @@ int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd)
                break;
        };
 
-       BUG("invalid command operation %u\n", cmd->op);
+       BUG("invalid command operation %u", cmd->op);
 }

diff --git a/src/expression.c b/src/expression.c
index 6c7bebe0a3d1262a6660000eeff4d7fc52da3783..4d68967f112e41d55fd2e77baf04d6b2d9cea156 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -1774,7 +1774,7 @@ void range_expr_value_low(mpz_t rop, const struct expr *expr)
        case EXPR_SET_ELEM:
                return range_expr_value_low(rop, expr->key);
        default:
-               BUG("invalid range expression type %s\n", expr_name(expr));
+               BUG("invalid range expression type %s", expr_name(expr));
        }
 }
 
@@ -1801,7 +1801,7 @@ void range_expr_value_high(mpz_t rop, const struct expr *expr)
        case EXPR_SET_ELEM:
                return range_expr_value_high(rop, expr->key);
        default:
-               BUG("invalid range expression type %s\n", expr_name(expr));
+               BUG("invalid range expression type %s", expr_name(expr));
        }
 }
 
@@ -1852,7 +1852,7 @@ const struct expr_ops *expr_ops(const struct expr *e)
 
        ops = __expr_ops_by_type(e->etype);
        if (!ops)
-               BUG("Unknown expression type %d\n", e->etype);
+               BUG("Unknown expression type %d", e->etype);
 
        return ops;
 }

diff --git a/src/fib.c b/src/fib.c
index 4db7cd2bbc9c3ff9372c7d03cc74aa1406a01498..f39da9331654605053c145240101ed2e3bae3130 100644 (file)
--- a/src/fib.c
+++ b/src/fib.c
@@ -195,7 +195,7 @@ struct expr *fib_expr_alloc(const struct location *loc,
                type = &fib_addr_type;
                break;
        default:
-               BUG("Unknown result %d\n", result);
+               BUG("Unknown result %d", result);
        }
 
        if (flags & NFTA_FIB_F_PRESENT) {

diff --git a/src/intervals.c b/src/intervals.c
index a63c58ac96066c36295f6e150b19ea71e28993bb..40ab42832fd9e0f4c3673cf020ec33f893a560ba 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -70,7 +70,7 @@ static void setelem_expr_to_range(struct expr *expr)
                expr->key = key;
                break;
        default:
-               BUG("unhandled key type %s\n", expr_name(expr->key));
+               BUG("unhandled key type %s", expr_name(expr->key));
        }
 }
 
@@ -226,7 +226,7 @@ static struct expr *interval_expr_key(struct expr *i)
                elem = i;
                break;
        default:
-               BUG("unhandled expression type %d\n", i->etype);
+               BUG("unhandled expression type %d", i->etype);
                return NULL;
        }
 
@@ -756,7 +756,7 @@ static struct expr *setelem_key(struct expr *expr)
                key = expr->key;
                break;
        default:
-               BUG("unhandled expression type %d\n", expr->etype);
+               BUG("unhandled expression type %d", expr->etype);
                return NULL;
        }
 
@@ -780,7 +780,7 @@ int setelem_to_interval(const struct set *set, struct expr *elem,
        }
 
        if (key->etype != EXPR_RANGE_VALUE)
-               BUG("key must be RANGE_VALUE, not %s\n", expr_name(key));
+               BUG("key must be RANGE_VALUE, not %s", expr_name(key));
 
        assert(!next_key || next_key->etype == EXPR_RANGE_VALUE);
 

diff --git a/src/json.c b/src/json.c
index 0afce5415f541d69b7a6de8222477f1f2bf132fc..9fb6d715a53de06344be4525085a42120bf05146 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1117,7 +1117,7 @@ static json_t *datatype_json(const struct expr *expr, struct output_ctx *octx)
                }
        } while ((dtype = dtype->basetype));
 
-       BUG("datatype %s has no print method or symbol table\n",
+       BUG("datatype %s has no print method or symbol table",
            expr->dtype->name);
 }
 
@@ -2149,7 +2149,7 @@ int do_command_list_json(struct netlink_ctx *ctx, struct cmd *cmd)
                errno = EOPNOTSUPP;
                return -1;
        case CMD_OBJ_INVALID:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
                break;
        }
 

diff --git a/src/mergesort.c b/src/mergesort.c
index bd1c21877b21deb0deeec097af33648e13db2dd6..a9cba614612ed4cba44815eba4da3a18a2b6e81d 100644 (file)
--- a/src/mergesort.c
+++ b/src/mergesort.c
@@ -48,7 +48,7 @@ static mpz_srcptr expr_msort_value(const struct expr *expr, mpz_t value)
                mpz_bitmask(value, expr->len);
                break;
        default:
-               BUG("Unknown expression %s\n", expr_name(expr));
+               BUG("Unknown expression %s", expr_name(expr));
        }
        return value;
 }

diff --git a/src/mnl.c b/src/mnl.c
index ab4a7dbc8d252819e261b3744ba354518ab545e2..0a445189da82c61b42f4cb78681e0257f0fae3f0 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -740,18 +740,18 @@ static void nft_dev_add(struct nft_dev *dev_array, const struct expr *expr, int
        char ifname[IFNAMSIZ];
 
        if (expr->etype != EXPR_VALUE)
-               BUG("Must be a value, not %s\n", expr_name(expr));
+               BUG("Must be a value, not %s", expr_name(expr));
 
        ifname_len = div_round_up(expr->len, BITS_PER_BYTE);
        memset(ifname, 0, sizeof(ifname));
 
        if (ifname_len > sizeof(ifname))
-               BUG("Interface length %u exceeds limit\n", ifname_len);
+               BUG("Interface length %u exceeds limit", ifname_len);
 
        mpz_export_data(ifname, expr->value, BYTEORDER_HOST_ENDIAN, ifname_len);
 
        if (strnlen(ifname, IFNAMSIZ) >= IFNAMSIZ)
-               BUG("Interface length %zu exceeds limit, no NUL byte\n", strnlen(ifname, IFNAMSIZ));
+               BUG("Interface length %zu exceeds limit, no NUL byte", strnlen(ifname, IFNAMSIZ));
 
        dev_array[i].ifname = xstrdup(ifname);
        dev_array[i].location = &expr->location;
@@ -1734,7 +1734,7 @@ int mnl_nft_obj_add(struct netlink_ctx *ctx, struct cmd *cmd,
                obj_tunnel_add_opts(nlo, &obj->tunnel);
                break;
        default:
-               BUG("Unknown type %d\n", obj->type);
+               BUG("Unknown type %d", obj->type);
                break;
        }
        netlink_dump_obj(nlo, ctx);

diff --git a/src/netlink.c b/src/netlink.c
index 3258f9ab9056e8b1fd486399cf1e6e8963b9b27d..26cf07c3792617b165e75582d7be31d4e340ec2e 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -125,7 +125,7 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,
                elem = expr;
        }
        if (elem->etype != EXPR_SET_ELEM)
-               BUG("Unexpected expression type: got %d\n", elem->etype);
+               BUG("Unexpected expression type: got %d", elem->etype);
 
        key = elem->key;
 
@@ -221,7 +221,7 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,
                                           nld.value, nld.len);
                        break;
                default:
-                       BUG("unexpected set element expression\n");
+                       BUG("unexpected set element expression");
                        break;
                }
        }
@@ -341,7 +341,8 @@ static void nft_data_memcpy(struct nft_data_linearize *nld,
                            const void *src, unsigned int len)
 {
        if (len > sizeof(nld->value))
-               BUG("nld buffer overflow: want to copy %u, max %u\n", len, (unsigned int)sizeof(nld->value));
+               BUG("nld buffer overflow: want to copy %u, max %u",
+                   len, (unsigned int)sizeof(nld->value));
 
        memcpy(nld->value, src, len);
        nld->len = len;
@@ -575,7 +576,7 @@ static void netlink_gen_key(const struct expr *expr,
        case EXPR_PREFIX:
                return netlink_gen_prefix(expr, data);
        default:
-               BUG("invalid data expression type %s\n", expr_name(expr));
+               BUG("invalid data expression type %s", expr_name(expr));
        }
 }
 
@@ -598,7 +599,7 @@ static void __netlink_gen_data(const struct expr *expr,
        case EXPR_PREFIX:
                return netlink_gen_prefix(expr, data);
        default:
-               BUG("invalid data expression type %s\n", expr_name(expr));
+               BUG("invalid data expression type %s", expr_name(expr));
        }
 }
 

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 990edc824ad9e0904c835e41c51adde41240af13..9561e298aebb5ec0f789ee26b4b2048b83352dc3 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -2474,7 +2474,7 @@ static void binop_adjust_one(const struct expr *binop, struct expr *value,
                value->len = left->len;
                break;
        default:
-               BUG("unknown expression type %s\n", expr_name(left));
+               BUG("unknown expression type %s", expr_name(left));
                break;
        }
 }
@@ -2505,7 +2505,8 @@ static void binop_adjust(const struct expr *binop, struct expr *right,
                                binop_adjust(binop, i->key->key, shift);
                                break;
                        default:
-                               BUG("unknown expression type %s\n", expr_name(i->key));
+                               BUG("unknown expression type %s",
+                                   expr_name(i->key));
                        }
                }
                break;
@@ -2514,7 +2515,7 @@ static void binop_adjust(const struct expr *binop, struct expr *right,
                binop_adjust_one(binop, right->right, shift);
                break;
        default:
-               BUG("unknown expression type %s\n", expr_name(right));
+               BUG("unknown expression type %s", expr_name(right));
                break;
        }
 }
@@ -2645,7 +2646,7 @@ static void relational_binop_postprocess(struct rule_pp_ctx *ctx,
                        expr->op = OP_NEG;
                        break;
                default:
-                       BUG("unknown operation type %d\n", expr->op);
+                       BUG("unknown operation type %d", expr->op);
                }
                expr_free(binop);
        } else if (datatype_prefix_notation(binop->left->dtype) &&
@@ -3051,7 +3052,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)
                ct_expr_update_type(&dl->pctx, expr);
                break;
        default:
-               BUG("unknown expression type %s\n", expr_name(expr));
+               BUG("unknown expression type %s", expr_name(expr));
        }
 }
 

diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 43cfbfa75f3d2fd4c7bf852ede1db52a3b2420f9..30bc0094cc7e6f705d883fd0e22183f34e28fcfd 100644 (file)
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -76,7 +76,7 @@ static enum nft_registers __get_register(struct netlink_linearize_ctx *ctx,
 
        n = netlink_register_space(size);
        if (ctx->reg_low + n > NFT_REG_1 + NFT_REG32_15 - NFT_REG32_00 + 1)
-               BUG("register reg_low %u invalid\n", ctx->reg_low);
+               BUG("register reg_low %u invalid", ctx->reg_low);
 
        reg = ctx->reg_low;
        ctx->reg_low += n;
@@ -90,7 +90,7 @@ static void __release_register(struct netlink_linearize_ctx *ctx,
 
        n = netlink_register_space(size);
        if (ctx->reg_low < NFT_REG_1 + n)
-               BUG("register reg_low %u invalid\n", ctx->reg_low);
+               BUG("register reg_low %u invalid", ctx->reg_low);
 
        ctx->reg_low -= n;
 }
@@ -457,7 +457,7 @@ static enum nft_cmp_ops netlink_gen_cmp_op(enum ops op)
        case OP_GTE:
                return NFT_CMP_GTE;
        default:
-               BUG("invalid comparison operation %u\n", op);
+               BUG("invalid comparison operation %u", op);
        }
 }
 
@@ -519,7 +519,7 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx,
                nft_rule_add_expr(ctx, nle, &expr->location);
                break;
        default:
-               BUG("invalid range operation %u\n", expr->op);
+               BUG("invalid range operation %u", expr->op);
 
        }
 
@@ -600,7 +600,7 @@ static void netlink_gen_relational(struct netlink_linearize_ctx *ctx,
        case OP_NEG:
                break;
        default:
-               BUG("invalid relational operation %u\n", expr->op);
+               BUG("invalid relational operation %u", expr->op);
        }
 
        switch (expr->right->etype) {
@@ -734,7 +734,7 @@ static void netlink_gen_bitwise_mask_xor(struct netlink_linearize_ctx *ctx,
                        combine_binop(mask, xor, tmp, val);
                        break;
                default:
-                       BUG("invalid binary operation %u\n", i->op);
+                       BUG("invalid binary operation %u", i->op);
                }
        }
 
@@ -780,7 +780,7 @@ static void netlink_gen_bitwise_bool(struct netlink_linearize_ctx *ctx,
                nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_OR);
                break;
        default:
-               BUG("invalid binary operation %u\n", expr->op);
+               BUG("invalid binary operation %u", expr->op);
        }
 
        netlink_gen_expr(ctx, expr->left, dreg);
@@ -824,7 +824,7 @@ static enum nft_byteorder_ops netlink_gen_unary_op(enum ops op)
        case OP_NTOH:
                return NFT_BYTEORDER_NTOH;
        default:
-               BUG("invalid unary operation %u\n", op);
+               BUG("invalid unary operation %u", op);
        }
 }
 
@@ -951,7 +951,7 @@ static void netlink_gen_expr(struct netlink_linearize_ctx *ctx,
        case EXPR_XFRM:
                return netlink_gen_xfrm(ctx, expr, dreg);
        default:
-               BUG("unknown expression type %s\n", expr_name(expr));
+               BUG("unknown expression type %s", expr_name(expr));
        }
 }
 
@@ -984,7 +984,7 @@ static void netlink_gen_objref_stmt(struct netlink_linearize_ctx *ctx,
                                   stmt->objref.type);
                break;
        default:
-               BUG("unsupported expression %u\n", expr->etype);
+               BUG("unsupported expression %u", expr->etype);
        }
        nft_rule_add_expr(ctx, nle, &expr->location);
 }
@@ -1072,7 +1072,7 @@ struct nftnl_expr *netlink_gen_stmt_stateful(const struct stmt *stmt)
        case STMT_LAST:
                return netlink_gen_last_stmt(stmt);
        default:
-               BUG("unknown stateful statement type %d\n", stmt->type);
+               BUG("unknown stateful statement type %d", stmt->type);
        }
 }
 
@@ -1231,7 +1231,7 @@ static unsigned int nat_addrlen(uint8_t family)
        case NFPROTO_IPV6: return 128;
        }
 
-       BUG("invalid nat family %u\n", family);
+       BUG("invalid nat family %u", family);
        return 0;
 }
 
@@ -1274,7 +1274,7 @@ static void netlink_gen_nat_stmt(struct netlink_linearize_ctx *ctx,
                nftnl_reg_pmax = NFTNL_EXPR_REDIR_REG_PROTO_MAX;
                break;
        default:
-               BUG("unknown nat type %d\n", stmt->nat.type);
+               BUG("unknown nat type %d", stmt->nat.type);
                break;
        }
 
@@ -1762,7 +1762,7 @@ static void netlink_gen_stmt(struct netlink_linearize_ctx *ctx,
        case STMT_OPTSTRIP:
                return netlink_gen_optstrip_stmt(ctx, stmt);
        default:
-               BUG("unknown statement type %d\n", stmt->type);
+               BUG("unknown statement type %d", stmt->type);
        }
 }
 

diff --git a/src/optimize.c b/src/optimize.c
index ffc06480d4ee5a587716f3846c67f729f5c0bf1b..17084a84d465560c194c7768e1134b9576fc117c 100644 (file)
--- a/src/optimize.c
+++ b/src/optimize.c
@@ -1181,7 +1181,7 @@ static void rule_optimize_print(struct output_ctx *octx,
        case INDESC_NETLINK:
                break;
        default:
-               BUG("invalid input descriptor type %u\n", indesc->type);
+               BUG("invalid input descriptor type %u", indesc->type);
        }
 
        print_location(octx->error_fp, indesc, loc);

diff --git a/src/rule.c b/src/rule.c
index f51d605cc1ad968a240af0107be3900c07df45cb..bb6f62c8ab7357180b2a16ad968a4aa64e6b3743 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -1460,7 +1460,7 @@ void cmd_free(struct cmd *cmd)
                        flowtable_free(cmd->flowtable);
                        break;
                default:
-                       BUG("invalid command object type %u\n", cmd->obj);
+                       BUG("invalid command object type %u", cmd->obj);
                }
        }
        free(cmd->attr);
@@ -1559,7 +1559,7 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl)
        case CMD_OBJ_FLOWTABLE:
                return mnl_nft_flowtable_add(ctx, cmd, flags);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -1570,7 +1570,7 @@ static int do_command_replace(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_RULE:
                return mnl_nft_rule_replace(ctx, cmd);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -1586,7 +1586,7 @@ static int do_command_insert(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_RULE:
                return mnl_nft_rule_add(ctx, cmd, flags);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -1640,7 +1640,7 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_FLOWTABLE:
                return mnl_nft_flowtable_del(ctx, cmd);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 
@@ -2668,7 +2668,7 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd)
                break;
        }
 
-       BUG("invalid command object type %u\n", cmd->obj);
+       BUG("invalid command object type %u", cmd->obj);
        return 0;
 }
 
@@ -2708,7 +2708,7 @@ static int do_command_get(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_ELEMENTS:
                return do_get_setelems(ctx, cmd, false);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 
        return 0;
@@ -2739,7 +2739,7 @@ static int do_command_flush(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_OBJ_RULESET:
                return mnl_nft_table_del(ctx, cmd);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -2757,7 +2757,7 @@ static int do_command_rename(struct netlink_ctx *ctx, struct cmd *cmd)
 
                return mnl_nft_chain_rename(ctx, cmd, chain);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
        return 0;
 }
@@ -2844,7 +2844,7 @@ int do_command(struct netlink_ctx *ctx, struct cmd *cmd)
        case CMD_DESCRIBE:
                return do_command_describe(ctx, cmd, &ctx->nft->output);
        default:
-               BUG("invalid command object type %u\n", cmd->obj);
+               BUG("invalid command object type %u", cmd->obj);
        }
 }
 

diff --git a/src/segtree.c b/src/segtree.c
index 88207a3987b8f51ab7868abda668eb5012e9bd19..cf2b4f129096f2a5f3f6038f813feb7e9e2393ca 100644 (file)
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -120,7 +120,7 @@ static struct expr *expr_value(struct expr *expr)
        case EXPR_VALUE:
                return expr;
        default:
-               BUG("invalid expression type %s\n", expr_name(expr));
+               BUG("invalid expression type %s", expr_name(expr));
        }
 }
 

diff --git a/src/statement.c b/src/statement.c
index 20241f6867a311b8cf7713ce93be05f5dcc34b19..d0993ddeac3b36beec1a8e760340da893d7b2f50 100644 (file)
--- a/src/statement.c
+++ b/src/statement.c
@@ -1138,7 +1138,7 @@ const struct stmt_ops *stmt_ops(const struct stmt *stmt)
 
        ops = __stmt_ops_by_type(stmt->type);
        if (!ops)
-               BUG("Unknown statement type %d\n", stmt->type);
+               BUG("Unknown statement type %d", stmt->type);
 
        return ops;
 }