From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 27 May 2008 18:33:28 +0000 (+0300)
Subject: Eliminate ill-indented block obfuscating the code
X-Git-Tag: rpm-4.6.0-rc1~456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27557a00d57974a17b8af933ce8c6f1ebfeb76b5;p=platform%2Fupstream%2Frpm.git

Eliminate ill-indented block obfuscating the code
---

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index b3527f2..8fd871b 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -2386,7 +2386,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
 	for (dbix = 0; dbix < dbiTags.max; dbix++) {
 	    dbiIndex dbi;
 	    rpmTag rpmtag;
-	    int xx;
+	    int xx, printed = 0;
 	    struct rpmtd_s tagdata;
 
 	    dbi = NULL;
@@ -2425,11 +2425,11 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
 	    if (!headerGet(h, rpmtag, &tagdata, HEADERGET_MINMEM))
 		continue;
 
-	  dbi = dbiOpen(db, rpmtag, 0);
-	  if (dbi != NULL) {
-	    int printed;
-
-	    printed = 0;
+	    if (!(dbi = dbiOpen(db, rpmtag, 0))) {
+		rpmtdFreeData(&tagdata);
+		continue;
+	    }
+	
 	    xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, DB_WRITECURSOR);
 	    rpmtdInit(&tagdata);
 	    while (rpmtdNext(&tagdata) >= 0) {
@@ -2574,7 +2574,6 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
 
 	    if (!dbi->dbi_no_dbsync)
 		xx = dbiSync(dbi, 0);
-	  }
 
 	    rpmtdFreeData(&tagdata);
 	}