summaryrefslogtreecommitdiff
path: root/lib/verify.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-03-12 09:01:25 +0200
committerPanu Matilainen <pmatilai@redhat.com>2010-03-12 09:04:29 +0200
commitdf9cdb1321ada8e3b120771f91a2eefab4ac2ad5 (patch)
treec17ec18d5c0d19e7acfb1557e5d72e17e2069e42 /lib/verify.c
parentd221895352955d5ee0503855f71c4bc242019273 (diff)
downloadlibrpm-tizen-df9cdb1321ada8e3b120771f91a2eefab4ac2ad5.tar.gz
librpm-tizen-df9cdb1321ada8e3b120771f91a2eefab4ac2ad5.tar.bz2
librpm-tizen-df9cdb1321ada8e3b120771f91a2eefab4ac2ad5.zip
Turn PSM into a complete blackbox
- The psm structures aren't stored or passed around by any users, so there's no need for them to separately allocate and free the struct, bury this all inside rpmpsmRun() which takes care of initialization, actual actions and freeing. - There's also no need for refcounting now as allocations are completely contained within the rpmpsmRun() blackbox. Lose psm-debug foo which was only used for refcount debugging. - No functional changes
Diffstat (limited to 'lib/verify.c')
-rw-r--r--lib/verify.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/verify.c b/lib/verify.c
index cb5ee546c..b931cf525 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -271,7 +271,6 @@ int rpmVerifyFile(const rpmts ts, const rpmfi fi,
*/
static int rpmVerifyScript(QVA_t qva, rpmts ts, Header h, FD_t scriptFd)
{
- rpmpsm psm = NULL;
rpmte te = NULL;
int rc = 0;
@@ -283,10 +282,7 @@ static int rpmVerifyScript(QVA_t qva, rpmts ts, Header h, FD_t scriptFd)
if (scriptFd != NULL)
rpmtsSetScriptFd(ts, scriptFd);
- /* create psm to run the script */
- psm = rpmpsmNew(ts, te);
- rc = rpmpsmRun(psm, PKG_VERIFY);
- psm = rpmpsmFree(psm);
+ rc = rpmpsmRun(ts, te, PKG_VERIFY);
if (scriptFd != NULL)
rpmtsSetScriptFd(ts, NULL);