All of lore.kernel.org
 help / color / mirror / Atom feed
From: Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
To: Larry.Finger@lwfinger.net, florian.c.schilhabel@googlemail.com,
	gregkh@linuxfoundation.org
Cc: outreachy-kernel@googlegroups.com,
	Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
Subject: [PATCH v2 4/4] staging: rtl8712: Invert if statement to reduce indentation level
Date: Sat, 18 Mar 2017 20:35:28 +0200	[thread overview]
Message-ID: <222d6a90a5b7077ed7dcc10d4ffcada0f9454bc2.1489861352.git.narcisaanamaria12@gmail.com> (raw)
In-Reply-To: <cover.1489861352.git.narcisaanamaria12@gmail.com>

Invert if statement to be able to return immediately in case of error,
and to avoid additional else branch, and then continue with the rest
of the function without excessive indentation.

This was found using the following Coccinelle script:

@disable neg_if@
expression e,E;
statement S;
@@

*if (e)
    S
    else { return -E; }

    @disable neg_if@
    expression e,E;
    statement S;
    identifier l;
    @@

    *if
(e)
    S
    else
{ rc = -E; goto l; }

Signed-off-by: Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
---
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 3d6e818..e30a5be 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1965,13 +1965,12 @@ static int r871x_get_ap_info(struct net_device *dev,
 			break;
 	}
 	pdata->flags = 0;
-	if (pdata->length >= 32) {
-		if (copy_from_user(data, pdata->pointer, 32))
-			return -EINVAL;
-		data[32] = 0;
-	} else {
+	if (pdata->length < 32)
 		return -EINVAL;
-	}
+	if (copy_from_user(data, pdata->pointer, 32))
+		return -EINVAL;
+	data[32] = 0;
+
 	spin_lock_irqsave(&(pmlmepriv->scanned_queue.lock), irqL);
 	phead = &queue->queue;
 	plist = phead->next;
-- 
1.9.1



  parent reply	other threads:[~2017-03-18 18:35 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-10 15:58 [PATCH 0/4] staging: rtl8712: Refactor conditionals Narcisa Ana Maria Vasile
2017-03-10 15:59 ` [PATCH 1/4] staging: rtl8712: Refactor conditionals in wpa_set_encryption Narcisa Ana Maria Vasile
2017-03-10 18:21   ` [Outreachy kernel] " Julia Lawall
2017-03-10 15:59 ` [PATCH 2/4] staging: rtl8712: Refactor conditional in r8711_wx_get_freq Narcisa Ana Maria Vasile
2017-03-10 18:19   ` [Outreachy kernel] " Julia Lawall
2017-03-10 15:59 ` [PATCH 3/4] staging: rtl8712: Refactor conditionals in r8711_wx_get_rate Narcisa Ana Maria Vasile
2017-03-10 18:15   ` [Outreachy kernel] " Julia Lawall
2017-03-10 16:00 ` [PATCH 4/4] staging: rtl8712: Refactor conditional in r871x_get_ap_info Narcisa Ana Maria Vasile
2017-03-10 18:08   ` [Outreachy kernel] " Julia Lawall
2017-03-10 20:37     ` Narcisa Ana Maria Vasile
2017-03-10 20:41       ` Julia Lawall
2017-03-10 18:22 ` [Outreachy kernel] [PATCH 0/4] staging: rtl8712: Refactor conditionals Julia Lawall
2017-03-18 18:33 ` [PATCH v2 0/4] staging: rtl8712: Invert if statements to reduce indentation level Narcisa Ana Maria Vasile
2017-03-18 18:34   ` [PATCH v2 1/4] " Narcisa Ana Maria Vasile
2017-03-18 18:35   ` [PATCH v2 2/4] staging: rtl8712: Invert if statement " Narcisa Ana Maria Vasile
2017-03-18 18:35   ` [PATCH v2 3/4] staging: rtl8712: Invert if statements to " Narcisa Ana Maria Vasile
2017-03-18 18:35   ` Narcisa Ana Maria Vasile [this message]
2017-03-21  7:44   ` [PATCH v2 0/4] " Greg KH
2017-03-21 22:52 ` [PATCH v3 0/4] staging: rtl8712: Refactor conditionals to reduce indentation Narcisa Ana Maria Vasile
2017-03-21 22:52   ` [PATCH v3 1/4] staging: rtl8712: Invert if statements to reduce indentation level Narcisa Ana Maria Vasile
2017-03-21 22:52   ` [PATCH v3 2/4] staging: rtl8712: Invert the test on check_fwstate() to reduce indentation Narcisa Ana Maria Vasile
2017-03-21 22:53   ` [PATCH v3 3/4] staging: rtl8712: Restructure code for clarity Narcisa Ana Maria Vasile
2017-03-21 22:53   ` [PATCH v3 4/4] staging: rtl8712: Invert comparison to reduce indentation Narcisa Ana Maria Vasile

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=222d6a90a5b7077ed7dcc10d4ffcada0f9454bc2.1489861352.git.narcisaanamaria12@gmail.com \
    --to=narcisaanamaria12@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=florian.c.schilhabel@googlemail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=outreachy-kernel@googlegroups.com \
    /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.