Skip to content

Commit 684dce1

Browse files
leitaoPaolo Abeni
authored andcommitted
net: netconsole: extract release appending into separate function
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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent b8dee8e commit 684dce1

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

drivers/net/netconsole.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,14 @@ static void send_msg_no_fragmentation(struct netconsole_target *nt,
10841084
netpoll_send_udp(&nt->np, buf, msg_len);
10851085
}
10861086

1087+
static void append_release(char *buf)
1088+
{
1089+
const char *release;
1090+
1091+
release = init_utsname()->release;
1092+
scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
1093+
}
1094+
10871095
static void send_msg_fragmented(struct netconsole_target *nt,
10881096
const char *msg,
10891097
const char *userdata,
@@ -1094,7 +1102,6 @@ static void send_msg_fragmented(struct netconsole_target *nt,
10941102
static char buf[MAX_PRINT_CHUNK]; /* protected by target_list_lock */
10951103
int offset = 0, userdata_len = 0;
10961104
const char *header, *msgbody;
1097-
const char *release;
10981105

10991106
#ifdef CONFIG_NETCONSOLE_DYNAMIC
11001107
if (userdata)
@@ -1115,10 +1122,8 @@ static void send_msg_fragmented(struct netconsole_target *nt,
11151122
* Transfer multiple chunks with the following extra header.
11161123
* "ncfrag=<byte-offset>/<total-bytes>"
11171124
*/
1118-
if (release_len) {
1119-
release = init_utsname()->release;
1120-
scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
1121-
}
1125+
if (release_len)
1126+
append_release(buf);
11221127

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

0 commit comments

Comments
 (0)