summaryrefslogtreecommitdiffstats
path: root/misc-utils/blkid.c
diff options
context:
space:
mode:
authorKarel Zak2014-05-13 09:55:10 +0200
committerKarel Zak2014-05-13 09:55:10 +0200
commit293eef71eaf92adca160fa2be18c92240c586f58 (patch)
tree1b26b61c5e723f675e1d0defdbdf12f26115d9ab /misc-utils/blkid.c
parentlibfdisk: fix %ju -> %zu (diff)
downloadkernel-qcow2-util-linux-293eef71eaf92adca160fa2be18c92240c586f58.tar.gz
kernel-qcow2-util-linux-293eef71eaf92adca160fa2be18c92240c586f58.tar.xz
kernel-qcow2-util-linux-293eef71eaf92adca160fa2be18c92240c586f58.zip
Revert "blkid: remove unused variable"
This reverts commit 0fd4b8132587a264f1e0df46eec7c12bba68c752.
Diffstat (limited to 'misc-utils/blkid.c')
-rw-r--r--misc-utils/blkid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 0d0ea6a22..b3eade56b 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) {