Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d07431 authored by Antonio Quartulli's avatar Antonio Quartulli
Browse files

batman-adv: don't use !! in bool conversion 



In C standard any expression different from 0 will be converted to
'true' when casting to bool (whatever is the length of the value).
Therefore all the "!!" conversions can be removed.

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent f86ce0ad

net/batman-adv/translation-table.c

+2 −2
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv, 
	/* remove address from local hash if present */

	local_flags = batadv_tt_local_remove(bat_priv, tt_addr,

					     "global tt received",

					     !!(flags & BATADV_TT_CLIENT_ROAM));

					     flags & BATADV_TT_CLIENT_ROAM);

	tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI;



	if (!(flags & BATADV_TT_CLIENT_ROAM))
@@ -2515,7 +2515,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, 
	if (!tt_global_entry)

		goto out;



	ret = !!(tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM);

	ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM;

	batadv_tt_global_entry_free_ref(tt_global_entry);

out:

	return ret;

net/batman-adv/unicast.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ batadv_frag_search_packet(struct list_head *head, 
{

	struct batadv_frag_packet_list_entry *tfp;

	struct batadv_unicast_frag_packet *tmp_up = NULL;

	int is_head_tmp, is_head;

	bool is_head_tmp, is_head;

	uint16_t search_seqno;



	if (up->flags & BATADV_UNI_FRAG_HEAD)
@@ -130,7 +130,7 @@ batadv_frag_search_packet(struct list_head *head, 
	else

		search_seqno = ntohs(up->seqno)-1;



	is_head = !!(up->flags & BATADV_UNI_FRAG_HEAD);

	is_head = up->flags & BATADV_UNI_FRAG_HEAD;



	list_for_each_entry(tfp, head, list) {

		if (!tfp->skb)
@@ -142,7 +142,7 @@ batadv_frag_search_packet(struct list_head *head, 
		tmp_up = (struct batadv_unicast_frag_packet *)tfp->skb->data;



		if (tfp->seqno == search_seqno) {

			is_head_tmp = !!(tmp_up->flags & BATADV_UNI_FRAG_HEAD);

			is_head_tmp = tmp_up->flags & BATADV_UNI_FRAG_HEAD;

			if (is_head_tmp != is_head)

				return tfp;

			else