From: Grant Erickson <gerickson@nuovations.com>
To: connman@lists.linux.dev
Subject: [PATCH 3/3] connection: Rename 'set_default[46]' local variables.
Date: Wed, 29 Nov 2023 16:23:05 -0800 [thread overview]
Message-ID: <20231130002309.1322111-4-gerickson@nuovations.com> (raw)
In-Reply-To: <20231130002309.1322111-1-gerickson@nuovations.com>
This renames the 'set_default[46]' local variables in
'__connman_connection_gateway_remove' to 'is_vpn[46]' to more
accurately reflect that they are tracking the state of:
do_ipv[46] && data->ipv[46]_config && data->ipv[46]_config->vpn
---
src/connection.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/connection.c b/src/connection.c
index 647631e54324..23eb3a45def3 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1596,7 +1596,7 @@ void __connman_connection_gateway_remove(struct connman_service *service,
enum connman_ipconfig_type type)
{
struct gateway_data *data = NULL;
- bool set_default4 = false, set_default6 = false;
+ bool is_vpn4 = false, is_vpn6 = false;
bool do_ipv4 = false, do_ipv6 = false;
int err;
@@ -1628,23 +1628,23 @@ void __connman_connection_gateway_remove(struct connman_service *service,
GATEWAY_DATA_DBG("service_data", data);
if (do_ipv4 && data->ipv4_config)
- set_default4 = data->ipv4_config->vpn;
+ is_vpn4 = data->ipv4_config->vpn;
if (do_ipv6 && data->ipv6_config)
- set_default6 = data->ipv6_config->vpn;
+ is_vpn6 = data->ipv6_config->vpn;
DBG("ipv4 gateway %s ipv6 gateway %s vpn %d/%d",
data->ipv4_config ? data->ipv4_config->gateway : "<null>",
data->ipv6_config ? data->ipv6_config->gateway : "<null>",
- set_default4, set_default6);
+ is_vpn4, is_vpn6);
/* If necessary, delete any VPN-related host routes. */
- if (set_default4 && data->index >= 0)
+ if (is_vpn4 && data->index >= 0)
connman_inet_del_host_route(data->ipv4_config->vpn_phy_index,
data->ipv4_config->gateway);
- if (set_default6 && data->index >= 0)
+ if (is_vpn6 && data->index >= 0)
connman_inet_del_ipv6_host_route(
data->ipv6_config->vpn_phy_index,
data->ipv6_config->gateway);
@@ -1673,7 +1673,7 @@ void __connman_connection_gateway_remove(struct connman_service *service,
* gateway delete notification.
* We hit the same issue if remove_gateway() fails.
*/
- if (set_default4 || set_default6 || err < 0) {
+ if (is_vpn4 || is_vpn6 || err < 0) {
data = find_default_gateway_data();
GATEWAY_DATA_DBG("default_data", data);
--
2.42.0
prev parent reply other threads:[~2023-11-30 0:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 0:23 [PATCH 0/3] connection: Optimize Conditional '&&' Clauses in '__connman_connection_gateway_remove' Grant Erickson
2023-11-30 0:23 ` [PATCH 1/3] connection: Fix white space indentation Grant Erickson
2023-11-30 0:23 ` [PATCH 2/3] connection: Optimize conditional '&&' clauses Grant Erickson
2023-11-30 0:23 ` Grant Erickson [this message]
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=20231130002309.1322111-4-gerickson@nuovations.com \
--to=gerickson@nuovations.com \
--cc=connman@lists.linux.dev \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).