The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc5ddd0b9f20666b6f7362f4f469962b148b832
commit 0cc5ddd0b9f20666b6f7362f4f469962b148b832 Author: Zhenlei Huang <z...@freebsd.org> AuthorDate: 2025-01-30 15:59:35 +0000 Commit: Zhenlei Huang <z...@freebsd.org> CommitDate: 2025-02-03 12:27:05 +0000 vnet: Fix style nits MFC after: 3 days (cherry picked from commit 903c7cdac5b5b4b720aba7a48abffb48b2588c77) (cherry picked from commit ceda6f83b119ab5c86478bedeefe8c0270691897) --- sys/net/vnet.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 9bcc0a779d59..da5fc5b52a72 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -204,7 +204,7 @@ struct vnet_data_free { static MALLOC_DEFINE(M_VNET_DATA_FREE, "vnet_data_free", "VNET resource accounting"); static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head = - TAILQ_HEAD_INITIALIZER(vnet_data_free_head); + TAILQ_HEAD_INITIALIZER(vnet_data_free_head); static struct sx vnet_data_free_lock; SDT_PROVIDER_DEFINE(vnet); @@ -480,7 +480,7 @@ vnet_data_copy(void *start, int size) void vnet_register_sysinit(void *arg) { - struct vnet_sysinit *vs, *vs2; + struct vnet_sysinit *vs, *vs2; struct vnet *vnet; vs = arg; @@ -755,11 +755,12 @@ db_show_vnet_print_vs(struct vnet_sysinit *vs, int ddb) c_db_sym_t sym; db_expr_t offset; -#define xprint(...) \ +#define xprint(...) do { \ if (ddb) \ db_printf(__VA_ARGS__); \ else \ - printf(__VA_ARGS__) + printf(__VA_ARGS__); \ +} while (0) if (vs == NULL) { xprint("%s: no vnet_sysinit * given\n", __func__);