mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 35/42] sound/oss: Adjust confusing if indentation
@ 2010-08-05 20:27 Julia Lawall
  2010-08-06  8:06 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Julia Lawall @ 2010-08-05 20:27 UTC (permalink / raw)
  To: Jaroslav Kysela, Takashi Iwai, linux-kernel, alsa-devel, kernel-janitors

From: Julia Lawall <julia@diku.dk>

Indent the branch of an if.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 sound/oss/ad1848.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 24793c5..4d2a6ae 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -716,7 +716,7 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
 				
 				default:
 					if (get_user(val, (int __user *)arg))
-					return -EFAULT;
+						return -EFAULT;
 					val = ad1848_mixer_set(devc, cmd & 0xff, val);
 					break;
 			} 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 35/42] sound/oss: Adjust confusing if indentation
  2010-08-05 20:27 [PATCH 35/42] sound/oss: Adjust confusing if indentation Julia Lawall
@ 2010-08-06  8:06 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-08-06  8:06 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Jaroslav Kysela, linux-kernel, alsa-devel, kernel-janitors

At Thu, 5 Aug 2010 22:27:32 +0200 (CEST),
Julia Lawall wrote:
> 
> From: Julia Lawall <julia@diku.dk>
> 
> Indent the branch of an if.
> 
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @r disable braces4@
> position p1,p2;
> statement S1,S2;
> @@
> 
> (
> if (...) { ... }
> |
> if (...) S1@p1 S2@p2
> )
> 
> @script:python@
> p1 << r.p1;
> p2 << r.p2;
> @@
> 
> if (p1[0].column == p2[0].column):
>   cocci.print_main("branch",p1)
>   cocci.print_secs("after",p2)
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>

Thanks, applied now.


Takashi

> 
> ---
>  sound/oss/ad1848.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
> index 24793c5..4d2a6ae 100644
> --- a/sound/oss/ad1848.c
> +++ b/sound/oss/ad1848.c
> @@ -716,7 +716,7 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
>  				
>  				default:
>  					if (get_user(val, (int __user *)arg))
> -					return -EFAULT;
> +						return -EFAULT;
>  					val = ad1848_mixer_set(devc, cmd & 0xff, val);
>  					break;
>  			} 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-08-06  8:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-05 20:27 [PATCH 35/42] sound/oss: Adjust confusing if indentation Julia Lawall
2010-08-06  8:06 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®