strcpy() is deprecated; use strscpy() instead. Since the destination buffer has a fixed length, strscpy() automatically determines its size using sizeof() when the size argument is omitted. This makes the explicit size argument unnecessary - remove it.
Now, combine both if-else branches using strscpy() and the same buffer into a single statement to simplify the code. No functional changes intended. Link: https://github.com/KSPP/linux/issues/88 Signed-off-by: Thorsten Blum <thorsten.b...@linux.dev> --- include/trace/events/fib6.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/trace/events/fib6.h b/include/trace/events/fib6.h index 8d22b2e98d48..903a18836bc6 100644 --- a/include/trace/events/fib6.h +++ b/include/trace/events/fib6.h @@ -64,11 +64,9 @@ TRACE_EVENT(fib6_table_lookup, __entry->dport = 0; } - if (res->nh && res->nh->fib_nh_dev) { - strscpy(__entry->name, res->nh->fib_nh_dev->name, IFNAMSIZ); - } else { - strcpy(__entry->name, "-"); - } + strscpy(__entry->name, res->nh && res->nh->fib_nh_dev ? + res->nh->fib_nh_dev->name : "-"); + if (res->f6i == net->ipv6.fib6_null_entry) { in6 = (struct in6_addr *)__entry->gw; *in6 = in6addr_any; -- 2.50.0
