diff options
| author | Boris Egorov <egorov@linux.com> | 2016-03-27 23:55:08 +0600 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2016-11-02 10:41:53 +0200 |
| commit | 1234747a82b7b479bc60b57fd2525c3ce088be7e (patch) | |
| tree | 8855c93c6787d634813e63af90c8324ed5b47aa2 | |
| parent | 05c41d2c84f85967921e2d5cdd51f5732da7d6a2 (diff) | |
| download | rpm-1234747a82b7b479bc60b57fd2525c3ce088be7e.tar.gz | |
Misleading indentation fixes (GCC6)
package.c:
This one is definitely an error (See commit 57000e976b1e5ed2c3c1e78567cd
stating "No functional changes").
rpminstall.c:
Judging by the code above, we should set eiu->fnp to NULL only on error,
but it happens every time we reach function end.
Signed-off-by: Boris Egorov <egorov@linux.com>
(cherry picked from commit dddc6e7be597e787917009c3d892ebe29c99eff8)
| -rw-r--r-- | lib/package.c | 3 | ||||
| -rw-r--r-- | lib/rpminstall.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/package.c b/lib/package.c index 282ea4236..fb2ff9194 100644 --- a/lib/package.c +++ b/lib/package.c @@ -127,9 +127,10 @@ static int stashKeyid(unsigned int keyid) if (keyids != NULL) for (i = 0; i < nkeyids; i++) { - if (keyid == keyids[i]) + if (keyid == keyids[i]) { seen = 1; goto exit; + } } if (nkeyids < nkeyids_max) { diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 94840eadd..d093ca21c 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -323,8 +323,10 @@ static int tryReadManifest(struct rpmEIU * eiu) Fclose(fd); fd = NULL; - if (rc != RPMRC_OK) - eiu->numFailed++; *eiu->fnp = NULL; + if (rc != RPMRC_OK) { + eiu->numFailed++; + *eiu->fnp = NULL; + } return rc; } |