diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-25 14:01:38 +0200 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-26 17:35:13 +0200 |
commit | 30d15deedf6b4fc7cfb7d3c252f9d838445979af (patch) | |
tree | e511f75c044c942051924bd7fa3a6d549bbaa636 /lib/psm.c | |
parent | e939e16364fa4a42880e2b15727c8aa68b83b257 (diff) | |
download | rpm-30d15deedf6b4fc7cfb7d3c252f9d838445979af.tar.gz rpm-30d15deedf6b4fc7cfb7d3c252f9d838445979af.tar.bz2 rpm-30d15deedf6b4fc7cfb7d3c252f9d838445979af.zip |
Rip the remains of fi->h in psm
- erasure doesn't need the special casing anymore
- remove useless comments
Diffstat (limited to 'lib/psm.c')
-rw-r--r-- | lib/psm.c | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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; } |