[PATCH net-next 7/9] net: netconsole: extract release appending into separate function

Breno Leitao
2024-09-03T14:08:20Z

Refactor the code by extracting the logic for appending the
release into the buffer into a separate function.

The goal is to reduce the size of send_msg_fragmented() and improve
code readability.

Signed-off-by: Breno Leitao <leitao@debian.org>
---
drivers/net/netconsole.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index c8a23a7684e5..be23def330e9 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1058,6 +1058,14 @@ static struct notifier_block netconsole_netdev_notifier = {
.notifier_call = netconsole_netdev_event,
};

+static void append_release(char *buf)
+{
+ const char *release;
+
+ release = init_utsname()->release;
+ scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
+}
+
static void send_msg_fragmented(struct netconsole_target *nt,
const char *msg,
const char *userdata,
@@ -1068,7 +1076,6 @@ static void send_msg_fragmented(struct netconsole_target *nt,
static char buf[MAX_PRINT_CHUNK]; /* protected by target_list_lock */
int offset = 0, userdata_len = 0;
const char *header, *msgbody;
- const char *release;

if (userdata)
userdata_len = nt->userdata_length;
@@ -1087,10 +1094,8 @@ static void send_msg_fragmented(struct netconsole_target *nt,
* Transfer multiple chunks with the following extra header.
* "ncfrag=<byte-offset>/<total-bytes>"
*/
- if (release_len) {
- release = init_utsname()->release;
- scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
- }
+ if (release_len)
+ append_release(buf);

/* Copy the header into the buffer */
memcpy(buf + release_len, header, header_len);
--
2.43.5