b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Antonio Quartulli <antonio@meshcoding.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH 1/5] batman-adv: checkpatch - else is not generally useful after a break or return
Date: Mon,  1 Sep 2014 14:37:25 +0200	[thread overview]
Message-ID: <1409575049-32726-1-git-send-email-antonio@meshcoding.com> (raw)

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 bitarray.h          | 3 +--
 fragmentation.h     | 3 +--
 network-coding.c    | 3 +--
 translation-table.c | 5 ++---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bitarray.h b/bitarray.h
index cc24073..2acaafe 100644
--- a/bitarray.h
+++ b/bitarray.h
@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
 	diff = last_seqno - curr_seqno;
 	if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
 		return 0;
-	else
-		return test_bit(diff, seq_bits) != 0;
+	return test_bit(diff, seq_bits) != 0;
 }
 
 /* turn corresponding bit on, so we can remember that we got the packet */
diff --git a/fragmentation.h b/fragmentation.h
index 5d7a0e6..d848cf6 100644
--- a/fragmentation.h
+++ b/fragmentation.h
@@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry)
 	if (!hlist_empty(&frags_entry->head) &&
 	    batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT))
 		return true;
-	else
-		return false;
+	return false;
 }
 
 #endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */
diff --git a/network-coding.c b/network-coding.c
index 8d04d17..bd33894 100644
--- a/network-coding.c
+++ b/network-coding.c
@@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb,
 {
 	if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src))
 		return false;
-	else
-		return true;
+	return true;
 }
 
 /**
diff --git a/translation-table.c b/translation-table.c
index 5f59e7f..38a804e 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -2769,9 +2769,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv,
 {
 	if (batadv_is_my_mac(bat_priv, req_dst))
 		return batadv_send_my_tt_response(bat_priv, tt_data, req_src);
-	else
-		return batadv_send_other_tt_response(bat_priv, tt_data,
-						     req_src, req_dst);
+	return batadv_send_other_tt_response(bat_priv, tt_data, req_src,
+					     req_dst);
 }
 
 static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
-- 
1.8.5.5


             reply	other threads:[~2014-09-01 12:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 12:37 Antonio Quartulli [this message]
2014-09-01 12:37 ` [B.A.T.M.A.N.] [PATCH 2/5] batman-adv: checkpatch - No space is necessary after a cast Antonio Quartulli
2014-11-01 14:05   ` Marek Lindner
2014-09-01 12:37 ` [B.A.T.M.A.N.] [PATCH 3/5] batman-adv: checkpatch - Please use a blank line after declarations Antonio Quartulli
2014-11-01 14:05   ` Marek Lindner
2014-09-01 12:37 ` [B.A.T.M.A.N.] [PATCH 4/5] batman-adv: checkpatch - Please don't use multiple blank lines Antonio Quartulli
2014-11-01 14:06   ` Marek Lindner
2014-09-01 12:37 ` [B.A.T.M.A.N.] [PATCH 5/5] batman-adv: checkpatch - remove unnecessary parentheses Antonio Quartulli
2014-11-01 14:07   ` Marek Lindner
2014-11-01 14:04 ` [B.A.T.M.A.N.] [PATCH 1/5] batman-adv: checkpatch - else is not generally useful after a break or return Marek Lindner

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=1409575049-32726-1-git-send-email-antonio@meshcoding.com \
    --to=antonio@meshcoding.com \
    --cc=b.a.t.m.a.n@lists.open-mesh.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).