From 7430affdd9f2a33019a75a589e4357c9be479657 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 31 Aug 2015 11:49:45 +0200 Subject: [PATCH] libblkid: (drbdmanage) improve version setting code Signed-off-by: Karel Zak --- libblkid/src/superblocks/drbdmanage.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libblkid/src/superblocks/drbdmanage.c b/libblkid/src/superblocks/drbdmanage.c index c8a7d4061b..bfe853ad30 100644 --- a/libblkid/src/superblocks/drbdmanage.c +++ b/libblkid/src/superblocks/drbdmanage.c @@ -44,9 +44,6 @@ static int probe_drbdmanage(blkid_probe pr, struct drbdmanage_hdr *hdr; unsigned char *cp; struct drbdmanage_pers *prs; - char persistence_version[10]; - int l; - hdr = (struct drbdmanage_hdr*) blkid_probe_get_buffer(pr, 0, sizeof(*hdr)); @@ -68,12 +65,10 @@ static int probe_drbdmanage(blkid_probe pr, if (!prs) return errno ? -errno : 1; - if (memcmp(prs->magic, persistence_magic, sizeof(prs->magic)) == 0) { - l = sprintf(persistence_version, "%d", - be32toh(prs->version_le)); - blkid_probe_set_value(pr, "PERSISTENCE_VERSION", - persistence_version, l); - } + if (memcmp(prs->magic, persistence_magic, sizeof(prs->magic)) == 0 && + blkid_probe_sprintf_value(pr, "PERSISTENCE_VERSION", + "%d", be32_to_cpu(prs->version_le)) != 0) + return errno ? -errno : 1; return 0; } -- 2.47.2