Skip to content

Commit b86be09

Browse files
Next-Door-TechNext-Door-Tech
committed
Remove extra indents before if followed by if else
This was driving clangd crazy - replaced with indents between the if and conditional parentheses in most places.
1 parent df8e4b9 commit b86be09

File tree

17 files changed

+70
-76
lines changed

17 files changed

+70
-76
lines changed

‎devLib/lcd128x64.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ void lcd128x64rectangle (int x1, int y1, int x2, int y2, int colour, int filled)
370370

371371
if (filled)
372372
{
373-
/**/ if (x1 == x2)
373+
if (x1 == x2)
374374
lcd128x64line (x1, y1, x2, y2, colour) ;
375375
else if (x1 < x2)
376376
for (x = x1 ; x <= x2 ; ++x)

‎devLib/piGlow.c‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ void piGlow1 (const int leg, const int ring, const int intensity)
4747
if ((leg < 0) || (leg > 2)) return ;
4848
if ((ring < 0) || (ring > 5)) return ;
4949

50-
/**/ if (leg == 0)
51-
legLeds = leg0 ;
52-
else if (leg == 1)
53-
legLeds = leg1 ;
54-
else
55-
legLeds = leg2 ;
50+
if (leg == 0) { legLeds = leg0 ; }
51+
else if (leg == 1) { legLeds = leg1 ; }
52+
else { legLeds = leg2 ; }
5653

5754
analogWrite (PIGLOW_BASE + legLeds [ring], intensity) ;
5855
}
@@ -71,12 +68,9 @@ void piGlowLeg (const int leg, const int intensity)
7168
if ((leg < 0) || (leg > 2))
7269
return ;
7370

74-
/**/ if (leg == 0)
75-
legLeds = leg0 ;
76-
else if (leg == 1)
77-
legLeds = leg1 ;
78-
else
79-
legLeds = leg2 ;
71+
if (leg == 0) { legLeds = leg0 ; }
72+
else if (leg == 1) { legLeds = leg1 ; }
73+
else { legLeds = leg2 ; }
8074

8175
for (i = 0 ; i < 6 ; ++i)
8276
analogWrite (PIGLOW_BASE + legLeds [i], intensity) ;

‎devLib/scrollPhat.c‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,21 @@ void scrollPhatRectangle (int x1, int y1, int x2, int y2, int colour, int filled
210210
{
211211
register int x ;
212212

213-
if (filled)
214-
{
215-
/**/ if (x1 == x2)
213+
if (filled) {
214+
if (x1 == x2) {
216215
scrollPhatLine (x1, y1, x2, y2, colour) ;
217-
else if (x1 < x2)
218-
for (x = x1 ; x <= x2 ; ++x)
219-
scrollPhatLine (x, y1, x, y2, colour) ;
220-
else
221-
for (x = x2 ; x <= x1 ; ++x)
222-
scrollPhatLine (x, y1, x, y2, colour) ;
223-
}
224-
else
225-
{
216+
}
217+
else if (x1 < x2) {
218+
for (x = x1 ; x <= x2 ; ++x) {
219+
scrollPhatLine (x, y1, x, y2, colour) ;
220+
}
221+
}
222+
else {
223+
for (x = x2 ; x <= x1 ; ++x) {
224+
scrollPhatLine (x, y1, x, y2, colour) ;
225+
}
226+
}
227+
} else {
226228
scrollPhatLine (x1, y1, x2, y1, colour) ;
227229
scrollPhatLineTo (x2, y2, colour) ;
228230
scrollPhatLineTo (x1, y2, colour) ;

‎examples/Gertboard/7segments.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ PI_THREAD (displayDigits)
9191
for (segment = 0 ; segment < 7 ; ++segment)
9292
{
9393
d = toupper (display [digit]) ;
94-
/**/ if ((d >= '0') && (d <= '9')) // Digit
94+
if ((d >= '0') && (d <= '9')) // Digit
9595
index = d - '0' ;
9696
else if ((d >= 'A') && (d <= 'F')) // Hex
9797
index = d - 'A' + 10 ;

‎examples/PiGlow/piglow.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int main (int argc, char *argv [])
9797
{
9898
percent = getPercent (argv [2]) ;
9999

100-
/**/ if (strcasecmp (argv [1], "red") == 0)
100+
if (strcasecmp (argv [1], "red") == 0)
101101
piGlowRing (PIGLOW_RED, percent) ;
102102
else if (strcasecmp (argv [1], "yellow") == 0)
103103
piGlowRing (PIGLOW_YELLOW, percent) ;
@@ -122,7 +122,7 @@ int main (int argc, char *argv [])
122122

123123
if (argc == 4)
124124
{
125-
/**/ if (strcasecmp (argv [1], "leg") == 0)
125+
if (strcasecmp (argv [1], "leg") == 0)
126126
{
127127
leg = atoi (argv [2]) ;
128128
if ((leg < 0) || (leg > 2))

‎examples/ds1302.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ int main (int argc, char *argv [])
205205

206206
if (argc == 2)
207207
{
208-
/**/ if (strcmp (argv [1], "-slc") == 0)
208+
if (strcmp (argv [1], "-slc") == 0)
209209
return setLinuxClock () ;
210210
else if (strcmp (argv [1], "-sdsc") == 0)
211211
return setDSclock () ;

‎examples/scrollPhat/scphat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ int main (int argc, char *argv [])
209209
while (arg != argc)
210210
{
211211
command = argv [arg] ;
212-
/**/ if (strcasecmp (command, "clear") == 0) arg += doClear () ;
212+
if (strcasecmp (command, "clear") == 0) arg += doClear () ;
213213
else if (strcasecmp (command, "cls") == 0) arg += doClear () ;
214214
else if (strcasecmp (command, "bright") == 0) arg += doBright (arg, argc, argv) ;
215215
else if (strcasecmp (command, "plot") == 0) arg += doPlot (arg, argc, argv) ;

‎gpio/gpio.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ void doMode (int argc, char *argv [])
370370

371371
mode = argv [3] ;
372372

373-
/**/ if (strcasecmp (mode, "in") == 0) pinMode (pin, INPUT) ;
373+
if (strcasecmp (mode, "in") == 0) pinMode (pin, INPUT) ;
374374
else if (strcasecmp (mode, "input") == 0) pinMode (pin, INPUT) ;
375375
else if (strcasecmp (mode, "out") == 0) pinMode (pin, OUTPUT) ;
376376
else if (strcasecmp (mode, "output") == 0) pinMode (pin, OUTPUT) ;
@@ -602,14 +602,14 @@ static void doWrite (int argc, char *argv [])
602602

603603
pin = atoi (argv [2]) ;
604604

605-
/**/ if ((strcasecmp (argv [3], "up") == 0) || (strcasecmp (argv [3], "on") == 0))
605+
if ((strcasecmp (argv [3], "up") == 0) || (strcasecmp (argv [3], "on") == 0))
606606
val = 1 ;
607607
else if ((strcasecmp (argv [3], "down") == 0) || (strcasecmp (argv [3], "off") == 0))
608608
val = 0 ;
609609
else
610610
val = atoi (argv [3]) ;
611611

612-
/**/ if (val == 0)
612+
if (val == 0)
613613
digitalWrite (pin, LOW) ;
614614
else
615615
digitalWrite (pin, HIGH) ;
@@ -1063,7 +1063,7 @@ int main (int argc, char *argv [])
10631063

10641064
// Initial test for /sys/class/gpio operations: --> deprecated, empty but still there
10651065

1066-
/**/ if (strcasecmp (argv [1], "exports" ) == 0) { SYSFS_DEPRECATED(argv[0]); return 0 ; }
1066+
if (strcasecmp (argv [1], "exports" ) == 0) { SYSFS_DEPRECATED(argv[0]); return 0 ; }
10671067
else if (strcasecmp (argv [1], "export" ) == 0) { SYSFS_DEPRECATED(argv[0]); return 0 ; }
10681068
else if (strcasecmp (argv [1], "edge" ) == 0) { SYSFS_DEPRECATED(argv[0]); return 0 ; }
10691069
else if (strcasecmp (argv [1], "unexport" ) == 0) { SYSFS_DEPRECATED(argv[0]); return 0 ; }
@@ -1094,7 +1094,7 @@ int main (int argc, char *argv [])
10941094

10951095
// Check for -g argument
10961096

1097-
/**/ if (strcasecmp (argv [1], "-g") == 0)
1097+
if (strcasecmp (argv [1], "-g") == 0)
10981098
{
10991099
wiringPiSetupGpio () ;
11001100

@@ -1180,7 +1180,7 @@ int main (int argc, char *argv [])
11801180

11811181
// Core wiringPi functions
11821182

1183-
/**/ if (strcasecmp (argv [1], "mode" ) == 0) doMode (argc, argv) ;
1183+
if (strcasecmp (argv [1], "mode" ) == 0) doMode (argc, argv) ;
11841184
else if (strcasecmp (argv [1], "read" ) == 0) doRead (argc, argv) ;
11851185
else if (strcasecmp (argv [1], "write" ) == 0) doWrite (argc, argv) ;
11861186
else if (strcasecmp (argv [1], "pwm" ) == 0) doPwm (argc, argv) ;

‎gpio/readall.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static void readallPhys (int physPin)
183183
printf (" | | ") ;
184184
else
185185
{
186-
/**/ if (wpMode == WPI_MODE_GPIO)
186+
if (wpMode == WPI_MODE_GPIO)
187187
pin = physPinToGpio (physPin) ;
188188
else if (wpMode == WPI_MODE_PHYS)
189189
pin = physPin ;
@@ -206,7 +206,7 @@ static void readallPhys (int physPin)
206206
printf (" | | ") ;
207207
else
208208
{
209-
/**/ if (wpMode == WPI_MODE_GPIO)
209+
if (wpMode == WPI_MODE_GPIO)
210210
pin = physPinToGpio (physPin) ;
211211
else if (wpMode == WPI_MODE_PHYS)
212212
pin = physPin ;
@@ -380,7 +380,7 @@ void doReadall (void)
380380

381381
piBoardId (&model, &rev, &mem, &maker, &overVolted) ;
382382

383-
/**/ if ((model == PI_MODEL_A) || (model == PI_MODEL_B))
383+
if ((model == PI_MODEL_A) || (model == PI_MODEL_B))
384384
abReadall (model, rev) ;
385385
else if ((model == PI_MODEL_BP) || (model == PI_MODEL_AP) ||
386386
(model == PI_MODEL_2) ||

‎wiringPi/ads1115.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ static void myAnalogWrite (struct wiringPiNodeStruct *node, int pin, int data)
252252

253253
reg = chan + 2 ;
254254

255-
/**/ if (data < -32767)
255+
if (data < -32767)
256256
ndata = -32767 ;
257257
else if (data > 32767)
258258
ndata = 32767 ;

0 commit comments

Comments
 (0)