2010-08-05 20:20:19

by Julia Lawall

Subject: [PATCH 11/42] drivers/ieee1394: Adjust confusing if indentation

From: Julia Lawall <[email protected]>

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 <[email protected]>

---
drivers/ieee1394/ohci1394.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index d0dc1db..5081502 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -1106,7 +1106,7 @@ static int ohci_iso_recv_init(struct hpsb_iso *iso)
if (recv->block_irq_interval * 4 > iso->buf_packets)
recv->block_irq_interval = iso->buf_packets / 4;
if (recv->block_irq_interval < 1)
- recv->block_irq_interval = 1;
+ recv->block_irq_interval = 1;

/* choose a buffer stride */
/* must be a power of 2, and <= PAGE_SIZE */

2010-08-05 21:49:31

by Stefan Richter

Subject: Re: [PATCH 11/42] drivers/ieee1394: Adjust confusing if indentation

Julia Lawall wrote:
> Indent the branch of an if.

Committed to linux1394-2.6.git.

> The semantic match that finds this problem is as follows:

It did not find this line though:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/feature-removal-schedule.txt;h=be7030e4dd73697ed5b979f02b6841dac7bb69c0#l549
--
Stefan Richter
-=====-==-=- =--- --=-=
http://arcgraph.de/sr/