summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2016-07-04 15:36:48 +0300
committerFlorian Festi <ffesti@redhat.com>2016-07-29 17:41:36 +0200
commit0e51d170042a878abb31d84e904a8ac3ca0d8254 (patch)
tree40f32cecf0ed1e5edd5edceb50e9ff538bcc294b
parent1ac507f15f014e69b926a1c2bf9a46a2a4dcaff3 (diff)
downloadrpm-0e51d170042a878abb31d84e904a8ac3ca0d8254.tar.gz
Remove some unnecessary assignments flagged by cppcheck
-rw-r--r--build/parseSpec.c2
-rw-r--r--lib/rpmgi.c1
-rw-r--r--tools/elfdeps.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 103218924..85b0ba3de 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -645,7 +645,7 @@ rpmRC checkForEncoding(Header h, int addtag)
#if HAVE_ICONV
const char *encoding = "utf-8";
rpmTagVal tag;
- iconv_t ic = (iconv_t) -1;
+ iconv_t ic;
char *dest = NULL;
size_t destlen = 0;
int strict = rpmExpandNumeric("%{_invalid_encoding_terminates_build}");
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 1e82446aa..c6663fde1 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -214,7 +214,6 @@ rpmgi rpmgiNew(rpmts ts, rpmgiFlags flags, ARGV_const_t argv)
gi->i = -1;
gi->errors = 0;
- gi->flags = flags;
gi->argv = argvNew();
gi->argc = 0;
rpmgiGlobArgv(gi, argv);
diff --git a/tools/elfdeps.c b/tools/elfdeps.c
index d3be691b5..74c268484 100644
--- a/tools/elfdeps.c
+++ b/tools/elfdeps.c
@@ -279,7 +279,7 @@ static void processProgHeaders(elfInfo *ei, GElf_Ehdr *ehdr)
static int processFile(const char *fn, int dtype)
{
int rc = 1;
- int fdno = -1;
+ int fdno;
struct stat st;
GElf_Ehdr *ehdr, ehdr_mem;
elfInfo *ei = rcalloc(1, sizeof(*ei));