From: wangweidong <wangweidong1@huawei•com>
To: Vlad Yasevich <vyasevich@gmail•com>, <davem@davemloft•net>,
<nhorman@tuxdriver•com>
Cc: <dingtianhong@huawei•com>, <linux-sctp@vger•kernel.org>,
<netdev@vger•kernel.org>
Subject: Re: [PATCH 1/4] sctp: merge two if statements to one
Date: Sat, 26 Oct 2013 10:59:52 +0800 [thread overview]
Message-ID: <526B3028.4060303@huawei.com> (raw)
In-Reply-To: <526B016D.6030301@gmail.com>
On 2013/10/26 7:40, Vlad Yasevich wrote:
> On 10/24/2013 09:50 PM, Wang Weidong wrote:
>> Two if statements do the same work, maybe we can merge them to
>> one. There is just code simplification, no functional changes.
>>
>> Signed-off-by: Wang Weidong <wangweidong1@huawei•com>
>> ---
>> net/sctp/auth.c | 12 ++++--------
>> 1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/net/sctp/auth.c b/net/sctp/auth.c
>> index 8c4fa5d..19fb0ae 100644
>> --- a/net/sctp/auth.c
>> +++ b/net/sctp/auth.c
>> @@ -539,18 +539,14 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc)
>> for (i = 0; i < n_elt; i++) {
>> id = ntohs(hmacs->hmac_ids[i]);
>>
>> - /* Check the id is in the supported range */
>> - if (id > SCTP_AUTH_HMAC_ID_MAX) {
>> - id = 0;
>> - continue;
>> - }
>> -
>> - /* See is we support the id. Supported IDs have name and
>> + /* Check the id is in the supported range. And
>> + * see is we support the id. Supported IDs have name and
>> * length fields set, so that we can allocated and use
>> * them. We can safely just check for name, for without the
>> * name, we can't allocate the TFM.
>> */
>> - if (!sctp_hmac_list[id].hmac_name) {
>> + if (id > SCTP_AUTH_HMAC_ID_MAX ||
>> + !sctp_hmac_list[id].hmac_name) {
>
> Can you please make the 2 parts of the 'if' statement above line up
> with each other instead of the code below. I makes it easy to see what
> the whole 'if conditional' is.
>
> Thanks
> -vlad
>
Ok, I will resend a new version.
Thanks.
>> id = 0;
>> continue;
>> }
>>
>
>
>
next prev parent reply other threads:[~2013-10-26 3:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-25 1:50 [PATCH 0/4] sctp: do some clean up and fix comments Wang Weidong
2013-10-25 1:50 ` [PATCH 1/4] sctp: merge two if statements to one Wang Weidong
2013-10-25 13:04 ` Sergei Shtylyov
2013-10-26 2:55 ` wangweidong
2013-10-25 23:40 ` Vlad Yasevich
2013-10-26 2:59 ` wangweidong [this message]
2013-10-25 1:50 ` [PATCH 2/4] sctp: remove the repeat initialize with 0 Wang Weidong
2013-10-25 23:42 ` Vlad Yasevich
2013-10-25 1:50 ` [PATCH 3/4] sctp: fix some comments in associola.c Wang Weidong
2013-10-25 23:43 ` Vlad Yasevich
2013-10-25 1:50 ` [PATCH 4/4] sctp: fix comment in chunk.c Wang Weidong
2013-10-25 23:45 ` Vlad Yasevich
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=526B3028.4060303@huawei.com \
--to=wangweidong1@huawei$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dingtianhong@huawei$(echo .)com \
--cc=linux-sctp@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=vyasevich@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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