Re: [Outreachy kernel] [PATCH 4/4] staging: rtl8712: Refactor conditional in r871x_get_ap_info

[Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>]

On Fri, Mar 10, 2017 at 07:08:59PM +0100, Julia Lawall wrote:
> 
> 
> On Fri, 10 Mar 2017, Narcisa Ana Maria Vasile wrote:
> 
> > Reduce indentation level in r871x_get_ap_info.
> > This was done using the following Coccinelle script:
> 
> Actually, this script doesn't do anything to the code.  It just detects an
> opportunity.  Otherwise,
> 
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
> 
 Yes, what I meant is that the script helped me find this opportunity to
 improve a piece of code. I'll resend another version of this patchset
 based on the observations you made. Should I still include the
 Coccinelle script, but mention I used it to detect, not to change the
 code?

 Thanks,
 Narcisa
> >
> > @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 | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> > index 7ba8cf6..0b73f67 100644
> > --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> > +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
> > @@ -1971,13 +1971,13 @@ 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
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/51a2ef5e1c0eedf9700b43a83914983a6584ed24.1489161001.git.narcisaanamaria12%40gmail.com.
> > For more options, visit https://groups.google.com/d/optout.
> >