From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 8 Sep 2009 11:11:59 +0000 (+0300)
Subject: Initialize diff on declaration where it fits comfortably on one line
X-Git-Tag: rpm-4.8.0-beta1~304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2ba2b6ce0b1f924546619eb99ab60f758c07837;p=platform%2Fupstream%2Frpm.git

Initialize diff on declaration where it fits comfortably on one line
---

diff --git a/lib/header.c b/lib/header.c
index 74cee50..d233c34 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -401,8 +401,7 @@ static int regionSwab(indexEntry entry, int il, int dl,
 	/* Alignment */
 	type = ie.info.type;
 	if (typeSizes[type] > 1) {
-	    unsigned diff;
-	    diff = typeSizes[type] - (dl % typeSizes[type]);
+	    unsigned diff = typeSizes[type] - (dl % typeSizes[type]);
 	    if (diff != typeSizes[type]) {
 		dl += diff;
 		if (ieprev.info.type == RPM_I18NSTRING_TYPE)
@@ -497,8 +496,7 @@ static void * doHeaderUnload(Header h,
 		/* Alignment */
 		type = entry->info.type;
 		if (typeSizes[type] > 1) {
-		    unsigned diff;
-		    diff = typeSizes[type] - (dl % typeSizes[type]);
+		    unsigned diff = typeSizes[type] - (dl % typeSizes[type]);
 		    if (diff != typeSizes[type]) {
 			drlen += diff;
 			pad += diff;
@@ -523,8 +521,7 @@ static void * doHeaderUnload(Header h,
 	/* Alignment */
 	type = entry->info.type;
 	if (typeSizes[type] > 1) {
-	    unsigned diff;
-	    diff = typeSizes[type] - (dl % typeSizes[type]);
+	    unsigned diff = typeSizes[type] - (dl % typeSizes[type]);
 	    if (diff != typeSizes[type]) {
 		driplen += diff;
 		pad += diff;