summaryrefslogtreecommitdiff
path: root/rpmio/rpmfileutil.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-05-28 19:43:52 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-05-28 19:43:52 +0300
commit182e9f8a64712b682db604e03aafa2ffe3c82e21 (patch)
tree14bf31aa2081de3eeec1ba443a7503262f1b25cd /rpmio/rpmfileutil.c
parentf1c46157fbca4d29639e8602b4e0de02e33489d0 (diff)
downloadlibrpm-tizen-182e9f8a64712b682db604e03aafa2ffe3c82e21.tar.gz
librpm-tizen-182e9f8a64712b682db604e03aafa2ffe3c82e21.tar.bz2
librpm-tizen-182e9f8a64712b682db604e03aafa2ffe3c82e21.zip
Eliminate bunch of obvious dead NULL-assignments around librpmio
Diffstat (limited to 'rpmio/rpmfileutil.c')
-rw-r--r--rpmio/rpmfileutil.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 6085a4657..506b97c86 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -528,9 +528,9 @@ char * rpmGenPath(const char * urlroot, const char * urlmdir,
result = rpmGetPath(url, root, "/", mdir, "/", file, NULL);
- xroot = _free(xroot);
- xmdir = _free(xmdir);
- xfile = _free(xfile);
+ free(xroot);
+ free(xmdir);
+ free(xfile);
free(url);
return result;
}
@@ -651,7 +651,7 @@ int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr)
argvAdd(&argv, globURL);
}
globfree(&gl);
- globURL = _free(globURL);
+ free(globURL);
}
argc = argvCount(argv);
@@ -669,11 +669,11 @@ exit:
#ifdef ENABLE_NLS
if (old_collate) {
(void) setlocale(LC_COLLATE, old_collate);
- old_collate = _free(old_collate);
+ free(old_collate);
}
if (old_ctype) {
(void) setlocale(LC_CTYPE, old_ctype);
- old_ctype = _free(old_ctype);
+ free(old_ctype);
}
#endif
av = _free(av);