diff options
author | Joe Crayne <joe@jerkface.net> | 2019-10-12 22:44:43 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-10-12 22:44:43 -0400 |
commit | 92bd9bda66884dbbb1f572f0cdf0063cea0b7d76 (patch) | |
tree | 8defc7f53599b8c906eae59332fef446e01524c7 | |
parent | cdf1abf190f1097c4f6ae2ff0a9fa023df6982f1 (diff) |
Applied debian patch to fix indentation warnings.
0015-fix-34-cases-of-Wmisleading-indentation-warnings.patch
From: Jan <cloux@rote.ch>
Date: Sat, 2 Mar 2019 21:47:29 +0100
Subject: fix: 34 cases of -Wmisleading-indentation warnings
- fixed misleading indentation as reported by gcc 8.2.0
-rw-r--r-- | byte_chr.c | 16 | ||||
-rw-r--r-- | byte_copy.c | 12 | ||||
-rw-r--r-- | byte_diff.c | 16 | ||||
-rw-r--r-- | chpst.c | 6 | ||||
-rw-r--r-- | str_chr.c | 16 | ||||
-rw-r--r-- | str_len.c | 12 |
6 files changed, 56 insertions, 22 deletions
@@ -13,10 +13,18 @@ int c; | |||
13 | ch = c; | 13 | ch = c; |
14 | t = s; | 14 | t = s; |
15 | for (;;) { | 15 | for (;;) { |
16 | if (!n) break; if (*t == ch) break; ++t; --n; | 16 | if (!n) break; |
17 | if (!n) break; if (*t == ch) break; ++t; --n; | 17 | if (*t == ch) break; |
18 | if (!n) break; if (*t == ch) break; ++t; --n; | 18 | ++t; --n; |
19 | if (!n) break; if (*t == ch) break; ++t; --n; | 19 | if (!n) break; |
20 | if (*t == ch) break; | ||
21 | ++t; --n; | ||
22 | if (!n) break; | ||
23 | if (*t == ch) break; | ||
24 | ++t; --n; | ||
25 | if (!n) break; | ||
26 | if (*t == ch) break; | ||
27 | ++t; --n; | ||
20 | } | 28 | } |
21 | return t - s; | 29 | return t - s; |
22 | } | 30 | } |
diff --git a/byte_copy.c b/byte_copy.c index 74c9e4a..d33dacd 100644 --- a/byte_copy.c +++ b/byte_copy.c | |||
@@ -8,9 +8,13 @@ register unsigned int n; | |||
8 | register char *from; | 8 | register char *from; |
9 | { | 9 | { |
10 | for (;;) { | 10 | for (;;) { |
11 | if (!n) return; *to++ = *from++; --n; | 11 | if (!n) return; |
12 | if (!n) return; *to++ = *from++; --n; | 12 | *to++ = *from++; --n; |
13 | if (!n) return; *to++ = *from++; --n; | 13 | if (!n) return; |
14 | if (!n) return; *to++ = *from++; --n; | 14 | *to++ = *from++; --n; |
15 | if (!n) return; | ||
16 | *to++ = *from++; --n; | ||
17 | if (!n) return; | ||
18 | *to++ = *from++; --n; | ||
15 | } | 19 | } |
16 | } | 20 | } |
diff --git a/byte_diff.c b/byte_diff.c index 0c4d17b..7abc766 100644 --- a/byte_diff.c +++ b/byte_diff.c | |||
@@ -8,10 +8,18 @@ register unsigned int n; | |||
8 | register char *t; | 8 | register char *t; |
9 | { | 9 | { |
10 | for (;;) { | 10 | for (;;) { |
11 | if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; | 11 | if (!n) return 0; |
12 | if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; | 12 | if (*s != *t) break; |
13 | if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; | 13 | ++s; ++t; --n; |
14 | if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; | 14 | if (!n) return 0; |
15 | if (*s != *t) break; | ||
16 | ++s; ++t; --n; | ||
17 | if (!n) return 0; | ||
18 | if (*s != *t) break; | ||
19 | ++s; ++t; --n; | ||
20 | if (!n) return 0; | ||
21 | if (*s != *t) break; | ||
22 | ++s; ++t; --n; | ||
15 | } | 23 | } |
16 | return ((int)(unsigned int)(unsigned char) *s) | 24 | return ((int)(unsigned int)(unsigned char) *s) |
17 | - ((int)(unsigned int)(unsigned char) *t); | 25 | - ((int)(unsigned int)(unsigned char) *t); |
@@ -309,12 +309,14 @@ int main(int argc, char **argv) { | |||
309 | case 'n': | 309 | case 'n': |
310 | switch (*optarg) { | 310 | switch (*optarg) { |
311 | case '-': | 311 | case '-': |
312 | if (optarg[scan_ulong(++optarg, &ul)]) usage(); nicelvl =ul; | 312 | if (optarg[scan_ulong(++optarg, &ul)]) usage(); |
313 | nicelvl =ul; | ||
313 | nicelvl *=-1; | 314 | nicelvl *=-1; |
314 | break; | 315 | break; |
315 | case '+': ++optarg; | 316 | case '+': ++optarg; |
316 | default: | 317 | default: |
317 | if (optarg[scan_ulong(optarg, &ul)]) usage(); nicelvl =ul; | 318 | if (optarg[scan_ulong(optarg, &ul)]) usage(); |
319 | nicelvl =ul; | ||
318 | break; | 320 | break; |
319 | } | 321 | } |
320 | break; | 322 | break; |
@@ -10,10 +10,18 @@ unsigned int str_chr(register const char *s,int c) | |||
10 | ch = c; | 10 | ch = c; |
11 | t = s; | 11 | t = s; |
12 | for (;;) { | 12 | for (;;) { |
13 | if (!*t) break; if (*t == ch) break; ++t; | 13 | if (!*t) break; |
14 | if (!*t) break; if (*t == ch) break; ++t; | 14 | if (*t == ch) break; |
15 | if (!*t) break; if (*t == ch) break; ++t; | 15 | ++t; |
16 | if (!*t) break; if (*t == ch) break; ++t; | 16 | if (!*t) break; |
17 | if (*t == ch) break; | ||
18 | ++t; | ||
19 | if (!*t) break; | ||
20 | if (*t == ch) break; | ||
21 | ++t; | ||
22 | if (!*t) break; | ||
23 | if (*t == ch) break; | ||
24 | ++t; | ||
17 | } | 25 | } |
18 | return t - s; | 26 | return t - s; |
19 | } | 27 | } |
@@ -8,9 +8,13 @@ unsigned int str_len(const char *s) | |||
8 | 8 | ||
9 | t = s; | 9 | t = s; |
10 | for (;;) { | 10 | for (;;) { |
11 | if (!*t) return t - s; ++t; | 11 | if (!*t) return t - s; |
12 | if (!*t) return t - s; ++t; | 12 | ++t; |
13 | if (!*t) return t - s; ++t; | 13 | if (!*t) return t - s; |
14 | if (!*t) return t - s; ++t; | 14 | ++t; |
15 | if (!*t) return t - s; | ||
16 | ++t; | ||
17 | if (!*t) return t - s; | ||
18 | ++t; | ||
15 | } | 19 | } |
16 | } | 20 | } |