diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 19:32:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-15 20:58:44 +0200 |
| commit | a2362e0ff5a7cec16e888502a3c16fe2fa7ba0fe (patch) | |
| tree | 65fe364e263391985bc0fd43103259dbe6119fa2 /soltools | |
| parent | cac8694feab1ccb422294ed3e2f8b682e15835fb (diff) | |
loplugin:buriedassign in sfx2..sot
Change-Id: I917752edb50020f9acb203038ce65f1ea25afa64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92312
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/cpp/_cpp.c | 3 | ||||
| -rw-r--r-- | soltools/cpp/_eval.c | 18 | ||||
| -rw-r--r-- | soltools/cpp/_lex.c | 10 | ||||
| -rw-r--r-- | soltools/cpp/_unix.c | 14 |
4 files changed, 33 insertions, 12 deletions
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c index 003611c3f53b..77a7193477c9 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -129,7 +129,8 @@ void error(ERROR, "Unidentifiable control line"); return; /* else empty line */ } - if ((np = lookup(tp, 0)) == NULL || ((np->flag & ISKW) == 0 && !skipping)) + np = lookup(tp, 0); + if (np == NULL || ((np->flag & ISKW) == 0 && !skipping)) { error(WARNING, "Unknown preprocessor control %t", tp); return; diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c index 7efdd82715d9..e8b679ea93e1 100644 --- a/soltools/cpp/_eval.c +++ b/soltools/cpp/_eval.c @@ -633,12 +633,14 @@ struct value break; case NAME1: - if ((np = lookup(tp, 0)) != NULL && np->flag & (ISDEFINED | ISMAC)) + np = lookup(tp, 0); + if (np != NULL && np->flag & (ISDEFINED | ISMAC)) v.val = 1; break; case NAME2: - if ((np = lookup(tp, 0)) != NULL && np->flag & (ISARCHITECTURE)) + np = lookup(tp, 0); + if (np != NULL && np->flag & (ISARCHITECTURE)) v.val = 1; break; @@ -700,16 +702,19 @@ struct value if (*p == '\\') { p += 1; - if ((i = digit(*p)) >= 0 && i <= 7) + i = digit(*p); + if (i >= 0 && i <= 7) { n = i; p += 1; - if ((i = digit(*p)) >= 0 && i <= 7) + i = digit(*p); + if (i >= 0 && i <= 7) { p += 1; n <<= 3; n += i; - if ((i = digit(*p)) >= 0 && i <= 7) + i = digit(*p); + if (i >= 0 && i <= 7) { p += 1; n <<= 3; @@ -721,7 +726,8 @@ struct value if (*p == 'x') { p += 1; - while ((i = digit(*p)) >= 0 && i <= 15) + i = digit(*p); + while (i >= 0 && i <= 15) { p += 1; n <<= 4; diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c index 135c36ca4f93..28fae7a548ec 100644 --- a/soltools/cpp/_lex.c +++ b/soltools/cpp/_lex.c @@ -624,10 +624,14 @@ int int fillbuf(Source * s) { - int n; + int n = 0; - if (s->fd < 0 || (n = read(s->fd, (char *) s->inl, INS / 8)) <= 0) - n = 0; + if (s->fd >= 0) + { + n = read(s->fd, (char *) s->inl, INS / 8); + if (n <= 0) + n = 0; + } s->inl += n; s->inl[0] = s->inl[1] = s->inl[2] = s->inl[3] = EOB; if (n == 0) diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index ac4b7624a00a..1135bb08ea40 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -99,7 +99,11 @@ void break; case 'V': - for (n = 0; (c = optarg[n]) != '\0'; n++) + for (n = 0;; n++) + { + c = optarg[n]; + if (c == '\0') + break; switch (c) { case 'i': @@ -125,10 +129,15 @@ void default: error(WARNING, "Unknown verbose option %c", c); } + } break; case 'X': - for (n = 0; (c = optarg[n]) != '\0'; n++) + for (n = 0;; n++) + { + c = optarg[n]; + if (c == '\0') + break; switch (c) { case 'a': @@ -167,6 +176,7 @@ void default: error(WARNING, "Unknown extension option %c", c); } + } break; case '+': |