summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-05-28 19:42:54 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-05-28 19:42:54 +0300
commitf1c46157fbca4d29639e8602b4e0de02e33489d0 (patch)
tree829e64ce2cb2bcdb4dd2d2f51e9971a0db35bd73
parente9d966a868f5dedf96a3086e0566c83a6a3446f6 (diff)
downloadrpm-f1c46157fbca4d29639e8602b4e0de02e33489d0.tar.gz
rpm-f1c46157fbca4d29639e8602b4e0de02e33489d0.tar.bz2
rpm-f1c46157fbca4d29639e8602b4e0de02e33489d0.zip
Eliminate dead NULL-assignments on argvFree() and argiFree()
-rw-r--r--rpmio/argv.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/rpmio/argv.c b/rpmio/argv.c
index cf6e2994e..f061f03de 100644
--- a/rpmio/argv.c
+++ b/rpmio/argv.c
@@ -35,20 +35,19 @@ ARGI_t argiFree(ARGI_t argi)
{
if (argi) {
argi->nvals = 0;
- argi->vals = _free(argi->vals);
+ free(argi->vals);
+ free(argi);
}
- argi = _free(argi);
return NULL;
}
ARGV_t argvFree(ARGV_t argv)
{
- ARGV_t av;
-
- if (argv)
- for (av = argv; *av; av++)
- *av = _free(*av);
- argv = _free(argv);
+ if (argv) {
+ for (ARGV_t av = argv; *av; av++)
+ free(*av);
+ free(argv);
+ }
return NULL;
}