aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Pawel Stefaniak <pstef@FreeBSD.org>2021-09-05 14:26:23 +0000
committerPiotr Pawel Stefaniak <pstef@FreeBSD.org>2021-09-15 23:46:44 +0000
commit7760b85414189789c792c92c66bb3ddb877deae1 (patch)
tree3d4405d9532ccfb7d1821b8a226d74ddb7194515
parent2171b2cbe084118e0e8f7de658f0302d0feb8827 (diff)
downloadsrc-7760b85414189789c792c92c66bb3ddb877deae1.tar.gz
src-7760b85414189789c792c92c66bb3ddb877deae1.zip
diff: decrease indent level
An upcoming change will add more code in the loop.
-rw-r--r--usr.bin/diff/diffreg.c43
1 files changed, 21 insertions, 22 deletions
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 4a00aff9243b..c9095ec46e88 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1378,35 +1378,34 @@ match_function(const long *f, int pos, FILE *fp)
const char *state = NULL;
lastline = pos;
- while (pos > last) {
+ for (; pos > last; pos--) {
fseek(fp, f[pos - 1], SEEK_SET);
nc = f[pos] - f[pos - 1];
if (nc >= sizeof(buf))
nc = sizeof(buf) - 1;
nc = fread(buf, 1, nc, fp);
- if (nc > 0) {
- buf[nc] = '\0';
- buf[strcspn(buf, "\n")] = '\0';
- if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
- if (begins_with(buf, "private:")) {
- if (!state)
- state = " (private)";
- } else if (begins_with(buf, "protected:")) {
- if (!state)
- state = " (protected)";
- } else if (begins_with(buf, "public:")) {
- if (!state)
- state = " (public)";
- } else {
- strlcpy(lastbuf, buf, sizeof(lastbuf));
- if (state)
- strlcat(lastbuf, state, sizeof(lastbuf));
- lastmatchline = pos;
- return (lastbuf);
- }
+ if (nc == 0)
+ continue;
+ buf[nc] = '\0';
+ buf[strcspn(buf, "\n")] = '\0';
+ if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
+ if (begins_with(buf, "private:")) {
+ if (!state)
+ state = " (private)";
+ } else if (begins_with(buf, "protected:")) {
+ if (!state)
+ state = " (protected)";
+ } else if (begins_with(buf, "public:")) {
+ if (!state)
+ state = " (public)";
+ } else {
+ strlcpy(lastbuf, buf, sizeof(lastbuf));
+ if (state)
+ strlcat(lastbuf, state, sizeof(lastbuf));
+ lastmatchline = pos;
+ return (lastbuf);
}
}
- pos--;
}
return (lastmatchline > 0 ? lastbuf : NULL);
}