From: Breno Leitao <leitao@debian.org>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Breno Leitao <leitao@debian.org>,
kernel-team@meta.com
Subject: [PATCH net-next 6/7] netconsole: improve code style in parser function
Date: Tue, 10 Jun 2025 08:18:18 -0700 [thread overview]
Message-ID: <20250610-rework-v1-6-7cfde283f246@debian.org> (raw)
In-Reply-To: <20250610-rework-v1-0-7cfde283f246@debian.org>
Split assignment from conditional checks and use preferred null pointer
check style (!delim instead of == NULL) in netconsole_parser_cmdline().
This improves code readability and follows kernel coding style
conventions.
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 3406a5cbdc11a..2a13b6f16f082 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1659,7 +1659,8 @@ static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
int ipv6;
if (*cur != '@') {
- if ((delim = strchr(cur, '@')) == NULL)
+ delim = strchr(cur, '@');
+ if (!delim)
goto parse_failed;
*delim = 0;
if (kstrtou16(cur, 10, &np->local_port))
@@ -1670,7 +1671,8 @@ static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
if (*cur != '/') {
ipversion_set = true;
- if ((delim = strchr(cur, '/')) == NULL)
+ delim = strchr(cur, '/');
+ if (!delim)
goto parse_failed;
*delim = 0;
ipv6 = netpoll_parse_ip_addr(cur, &np->local_ip);
@@ -1684,7 +1686,8 @@ static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
if (*cur != ',') {
/* parse out dev_name or dev_mac */
- if ((delim = strchr(cur, ',')) == NULL)
+ delim = strchr(cur, ',');
+ if (!delim)
goto parse_failed;
*delim = 0;
@@ -1701,7 +1704,8 @@ static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
if (*cur != '@') {
/* dst port */
- if ((delim = strchr(cur, '@')) == NULL)
+ delim = strchr(cur, '@');
+ if (!delim)
goto parse_failed;
*delim = 0;
if (*cur == ' ' || *cur == '\t')
@@ -1713,7 +1717,8 @@ static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
cur++;
/* dst ip */
- if ((delim = strchr(cur, '/')) == NULL)
+ delim = strchr(cur, '/');
+ if (!delim)
goto parse_failed;
*delim = 0;
ipv6 = netpoll_parse_ip_addr(cur, &np->remote_ip);
--
2.47.1
next prev parent reply other threads:[~2025-06-10 15:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-10 15:18 [PATCH net-next 0/7] netpoll: Untangle netconsole and netpoll Breno Leitao
2025-06-10 15:18 ` [PATCH net-next 1/7] netpoll: remove __netpoll_cleanup from exported API Breno Leitao
2025-06-10 15:18 ` [PATCH net-next 2/7] netpoll: expose netpoll logging macros in public header Breno Leitao
2025-06-10 15:18 ` [PATCH net-next 3/7] netpoll: relocate netconsole-specific functions to netconsole module Breno Leitao
2025-06-10 15:18 ` [PATCH net-next 4/7] netpoll: move netpoll_print_options to netconsole Breno Leitao
2025-06-10 15:18 ` [PATCH net-next 5/7] netconsole: rename functions to better reflect their purpose Breno Leitao
2025-06-10 15:18 ` Breno Leitao [this message]
2025-06-10 15:18 ` [PATCH net-next 7/7] selftest: netconsole: add test for cmdline configuration Breno Leitao
2025-06-11 8:08 ` [PATCH net-next 0/7] netpoll: Untangle netconsole and netpoll Breno Leitao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250610-rework-v1-6-7cfde283f246@debian.org \
--to=leitao@debian.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).