From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 25 Nov 2008 12:01:38 +0000 (+0200)
Subject: Rip the remains of fi->h in psm
X-Git-Tag: tznext/4.11.0.1.tizen20130304~3332
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30d15deedf6b4fc7cfb7d3c252f9d838445979af;p=tools%2Flibrpm-tizen.git

Rip the remains of fi->h in psm
- erasure doesn't need the special casing anymore
- remove useless comments
---

diff --git a/lib/psm.c b/lib/psm.c
index bdbb54d..f0c3d60 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;
 }