From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 May 2014 07:55:10 +0000 (+0200)
Subject: Revert "blkid: remove unused variable"
X-Git-Tag: v2.25-rc1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=293eef71eaf92adca160fa2be18c92240c586f58;p=thirdparty%2Futil-linux.git

Revert "blkid: remove unused variable"

This reverts commit 0fd4b8132587a264f1e0df46eec7c12bba68c752.
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 0d0ea6a222..b3eade56b4 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -366,7 +366,7 @@ static void print_tags(blkid_dev dev, char *show[], int output)
 
 static int append_str(char **res, size_t *sz, const char *a, const char *b)
 {
-	char *str;
+	char *str = *res;
 	size_t asz = a ? strlen(a) : 0;
 	size_t bsz = b ? strlen(b) : 0;
 	size_t len = *sz + asz + bsz;
@@ -374,7 +374,7 @@ static int append_str(char **res, size_t *sz, const char *a, const char *b)
 	if (!len)
 		return -1;
 
-	str = xrealloc(str, len + 1);
+	*res = str = xrealloc(str, len + 1);
 	str += *sz;
 
 	if (a) {