From 92bd9bda66884dbbb1f572f0cdf0063cea0b7d76 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 12 Oct 2019 22:44:43 -0400 Subject: Applied debian patch to fix indentation warnings. 0015-fix-34-cases-of-Wmisleading-indentation-warnings.patch From: Jan 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 --- byte_chr.c | 16 ++++++++++++---- byte_copy.c | 12 ++++++++---- byte_diff.c | 16 ++++++++++++---- chpst.c | 6 ++++-- str_chr.c | 16 ++++++++++++---- str_len.c | 12 ++++++++---- 6 files changed, 56 insertions(+), 22 deletions(-) diff --git a/byte_chr.c b/byte_chr.c index fd56056..020b230 100644 --- a/byte_chr.c +++ b/byte_chr.c @@ -13,10 +13,18 @@ int c; ch = c; t = s; for (;;) { - if (!n) break; if (*t == ch) break; ++t; --n; - if (!n) break; if (*t == ch) break; ++t; --n; - if (!n) break; if (*t == ch) break; ++t; --n; - if (!n) break; if (*t == ch) break; ++t; --n; + if (!n) break; + if (*t == ch) break; + ++t; --n; + if (!n) break; + if (*t == ch) break; + ++t; --n; + if (!n) break; + if (*t == ch) break; + ++t; --n; + if (!n) break; + if (*t == ch) break; + ++t; --n; } return t - s; } 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; register char *from; { for (;;) { - if (!n) return; *to++ = *from++; --n; - if (!n) return; *to++ = *from++; --n; - if (!n) return; *to++ = *from++; --n; - if (!n) return; *to++ = *from++; --n; + if (!n) return; + *to++ = *from++; --n; + if (!n) return; + *to++ = *from++; --n; + if (!n) return; + *to++ = *from++; --n; + if (!n) return; + *to++ = *from++; --n; } } 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; register char *t; { for (;;) { - if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; - if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; - if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; - if (!n) return 0; if (*s != *t) break; ++s; ++t; --n; + if (!n) return 0; + if (*s != *t) break; + ++s; ++t; --n; + if (!n) return 0; + if (*s != *t) break; + ++s; ++t; --n; + if (!n) return 0; + if (*s != *t) break; + ++s; ++t; --n; + if (!n) return 0; + if (*s != *t) break; + ++s; ++t; --n; } return ((int)(unsigned int)(unsigned char) *s) - ((int)(unsigned int)(unsigned char) *t); diff --git a/chpst.c b/chpst.c index 2b9eb01..8de213f 100644 --- a/chpst.c +++ b/chpst.c @@ -309,12 +309,14 @@ int main(int argc, char **argv) { case 'n': switch (*optarg) { case '-': - if (optarg[scan_ulong(++optarg, &ul)]) usage(); nicelvl =ul; + if (optarg[scan_ulong(++optarg, &ul)]) usage(); + nicelvl =ul; nicelvl *=-1; break; case '+': ++optarg; default: - if (optarg[scan_ulong(optarg, &ul)]) usage(); nicelvl =ul; + if (optarg[scan_ulong(optarg, &ul)]) usage(); + nicelvl =ul; break; } break; diff --git a/str_chr.c b/str_chr.c index 9b467eb..a29d600 100644 --- a/str_chr.c +++ b/str_chr.c @@ -10,10 +10,18 @@ unsigned int str_chr(register const char *s,int c) ch = c; t = s; for (;;) { - if (!*t) break; if (*t == ch) break; ++t; - if (!*t) break; if (*t == ch) break; ++t; - if (!*t) break; if (*t == ch) break; ++t; - if (!*t) break; if (*t == ch) break; ++t; + if (!*t) break; + if (*t == ch) break; + ++t; + if (!*t) break; + if (*t == ch) break; + ++t; + if (!*t) break; + if (*t == ch) break; + ++t; + if (!*t) break; + if (*t == ch) break; + ++t; } return t - s; } diff --git a/str_len.c b/str_len.c index dedd005..38c6e28 100644 --- a/str_len.c +++ b/str_len.c @@ -8,9 +8,13 @@ unsigned int str_len(const char *s) t = s; for (;;) { - if (!*t) return t - s; ++t; - if (!*t) return t - s; ++t; - if (!*t) return t - s; ++t; - if (!*t) return t - s; ++t; + if (!*t) return t - s; + ++t; + if (!*t) return t - s; + ++t; + if (!*t) return t - s; + ++t; + if (!*t) return t - s; + ++t; } } -- cgit v1.2.3