summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-05-30 11:00:31 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-05-30 11:00:31 +0300
commitb296ddb8406e56adce0faa7003d3bddecddf7626 (patch)
tree0c8d6452dc9523613c6f49c068a5562193fde427 /tools
parenta25c3c7bac95ab7eb55f0ecf0b8793d8da341611 (diff)
downloadrpm-b296ddb8406e56adce0faa7003d3bddecddf7626.tar.gz
Eliminate a few dead NULL-assignment eliminations in rpmgraph
- There are more but leaving the rest as a reminder to clean up rpmGraph() someday when bored enough...
Diffstat (limited to 'tools')
-rw-r--r--tools/rpmgraph.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index bbb9d2902..082a9cd99 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -22,7 +22,6 @@ static rpmVSFlags vsflags = 0;
static int
rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv)
{
- rpmps ps;
char ** pkgURL = NULL;
char * pkgState = NULL;
const char ** fnp;
@@ -158,6 +157,7 @@ maybe_manifest:
if (numFailed > 0) goto exit;
if (!noDeps) {
+ rpmps ps;
rc = rpmtsCheck(ts);
if (rc) {
numFailed += numPkgs;
@@ -169,7 +169,7 @@ maybe_manifest:
rpmpsPrint(NULL, ps);
numFailed += numPkgs;
}
- ps = rpmpsFree(ps);
+ rpmpsFree(ps);
}
rc = rpmtsOrder(ts);
@@ -196,7 +196,7 @@ maybe_manifest:
fprintf(stdout, " { rank=max ; \"%s\" }\n", rpmteN(p));
}
}
- pi = rpmtsiFree(pi);
+ rpmtsiFree(pi);
fprintf(stdout, "}\n");
}
@@ -250,9 +250,9 @@ main(int argc, char *argv[])
ec = rpmGraph(ts, ia, poptGetArgs(optCon));
- ts = rpmtsFree(ts);
+ rpmtsFree(ts);
- optCon = rpmcliFini(optCon);
+ rpmcliFini(optCon);
return ec;
}