From 30d15deedf6b4fc7cfb7d3c252f9d838445979af Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 25 Nov 2008 14:01:38 +0200 Subject: Rip the remains of fi->h in psm - erasure doesn't need the special casing anymore - remove useless comments --- lib/psm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index bdbb54d19..f0c3d60bb 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1161,7 +1161,6 @@ static int rpmpsmNext(rpmpsm psm, pkgStage nstage) return rpmpsmStage(psm, psm->nstage); } -/* FIX: testing null annotation for fi->h */ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) { const rpmts ts = psm->ts; @@ -1250,8 +1249,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) } if (psm->goal == PSM_PKGERASE) { psm->scriptArg = psm->npkgs_installed - 1; - /* XXX preserve RPMDB_LOAD behavior for now */ - fi->h = rpmteHeader(psm->te); } break; case PSM_PRE: @@ -1520,8 +1517,6 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) if (psm->goal == PSM_PKGERASE) { if (psm->te != NULL) rpmteSetHeader(psm->te, NULL); - if (fi->h != NULL) - fi->h = headerFree(fi->h); } psm->failedFile = _free(psm->failedFile); @@ -1648,6 +1643,5 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) break; } - /* FIX: psm->oh and psm->fi->h may be NULL. */ return rc; } -- cgit v1.2.3