From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Marek Lindner <mareklindner@neomailbox.ch>,
Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH 09/12] batman-adv: main, Convert is_my_mac() to bool
Date: Wed, 3 Jun 2015 16:14:05 +0200 [thread overview]
Message-ID: <1433340848-1682-10-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1433340848-1682-1-git-send-email-antonio@meshcoding.com>
From: Markus Pargmann <mpa@pengutronix.de>
It is much clearer to see a bool type as return value than 'int' for
functions that are supposed to return true or false.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
net/batman-adv/main.c | 11 +++++++----
net/batman-adv/main.h | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index fd9333d..a22247a 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -209,10 +209,13 @@ void batadv_mesh_free(struct net_device *soft_iface)
* interfaces in the current mesh
* @bat_priv: the bat priv with all the soft interface information
* @addr: the address to check
+ *
+ * Returns 'true' if the mac address was found, false otherwise.
*/
-int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
+bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
{
const struct batadv_hard_iface *hard_iface;
+ bool is_my_mac = false;
rcu_read_lock();
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
@@ -223,12 +226,12 @@ int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
continue;
if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
- rcu_read_unlock();
- return 1;
+ is_my_mac = true;
+ break;
}
}
rcu_read_unlock();
- return 0;
+ return is_my_mac;
}
/**
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 026ba37..96876d2 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -195,7 +195,7 @@ extern struct workqueue_struct *batadv_event_workqueue;
int batadv_mesh_init(struct net_device *soft_iface);
void batadv_mesh_free(struct net_device *soft_iface);
-int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
+bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
struct batadv_hard_iface *
batadv_seq_print_text_primary_if_get(struct seq_file *seq);
int batadv_max_header_len(void);
--
2.4.2
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Markus Pargmann <mpa@pengutronix.de>,
Marek Lindner <mareklindner@neomailbox.ch>,
Antonio Quartulli <antonio@meshcoding.com>
Subject: [PATCH 09/12] batman-adv: main, Convert is_my_mac() to bool
Date: Wed, 3 Jun 2015 16:14:05 +0200 [thread overview]
Message-ID: <1433340848-1682-10-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1433340848-1682-1-git-send-email-antonio@meshcoding.com>
From: Markus Pargmann <mpa@pengutronix.de>
It is much clearer to see a bool type as return value than 'int' for
functions that are supposed to return true or false.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
net/batman-adv/main.c | 11 +++++++----
net/batman-adv/main.h | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index fd9333d..a22247a 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -209,10 +209,13 @@ void batadv_mesh_free(struct net_device *soft_iface)
* interfaces in the current mesh
* @bat_priv: the bat priv with all the soft interface information
* @addr: the address to check
+ *
+ * Returns 'true' if the mac address was found, false otherwise.
*/
-int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
+bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
{
const struct batadv_hard_iface *hard_iface;
+ bool is_my_mac = false;
rcu_read_lock();
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
@@ -223,12 +226,12 @@ int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr)
continue;
if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) {
- rcu_read_unlock();
- return 1;
+ is_my_mac = true;
+ break;
}
}
rcu_read_unlock();
- return 0;
+ return is_my_mac;
}
/**
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 026ba37..96876d2 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -195,7 +195,7 @@ extern struct workqueue_struct *batadv_event_workqueue;
int batadv_mesh_init(struct net_device *soft_iface);
void batadv_mesh_free(struct net_device *soft_iface);
-int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
+bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
struct batadv_hard_iface *
batadv_seq_print_text_primary_if_get(struct seq_file *seq);
int batadv_max_header_len(void);
--
2.4.2
next prev parent reply other threads:[~2015-06-03 14:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 14:13 [B.A.T.M.A.N.] pull request: batman-adv 20150603 Antonio Quartulli
2015-06-03 14:13 ` Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 01/12] batman-adv: iv_ogm_aggregate_new, simplify error handling Antonio Quartulli
2015-06-03 14:13 ` Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 02/12] batman-adv: iv_ogm_queue_add, Simplify expressions Antonio Quartulli
2015-06-03 14:13 ` Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 03/12] batman-adv: iv_ogm_orig_update, style, add missing brackets Antonio Quartulli
2015-06-03 14:13 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 04/12] batman-adv: iv_ogm, Fix dup_status comment Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 05/12] batman-adv: iv_ogm, fix coding style Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 06/12] batman-adv: iv_ogm, fix comment function name Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 07/12] batman-adv: types, Fix comment on bcast_own Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 08/12] batman-adv: Remove unnecessary check for orig_ifinfo not NULL Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli [this message]
2015-06-03 14:14 ` [PATCH 09/12] batman-adv: main, Convert is_my_mac() to bool Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 10/12] batman-adv: main, batadv_compare_eth return bool Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 11/12] batman-adv: Remove unnecessary ret variable Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 12/12] batman-adv: Remove unnecessary ret variable in algo_register Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli
2015-06-04 3:23 ` [B.A.T.M.A.N.] pull request: batman-adv 20150603 David Miller
2015-06-04 3:23 ` David Miller
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=1433340848-1682-10-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.