ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: (drbdmanage) improve version setting code 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-08-31 11:49:45 +02:00
parent 928f209cea
commit 7430affdd9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libblkid/src/superblocks/drbdmanage.c
View File

@ -44,9 +44,6 @@ static int probe_drbdmanage(blkid_probe pr,
struct drbdmanage_hdr *hdr; struct drbdmanage_hdr *hdr;
unsigned char *cp; unsigned char *cp;
struct drbdmanage_pers *prs; struct drbdmanage_pers *prs;
char persistence_version[10];
int l;
hdr = (struct drbdmanage_hdr*) hdr = (struct drbdmanage_hdr*)
blkid_probe_get_buffer(pr, 0, sizeof(*hdr)); blkid_probe_get_buffer(pr, 0, sizeof(*hdr));
@ -68,12 +65,10 @@ static int probe_drbdmanage(blkid_probe pr,
if (!prs) if (!prs)
return errno ? -errno : 1; return errno ? -errno : 1;
if (memcmp(prs->magic, persistence_magic, sizeof(prs->magic)) == 0) { if (memcmp(prs->magic, persistence_magic, sizeof(prs->magic)) == 0 &&
l = sprintf(persistence_version, "%d", blkid_probe_sprintf_value(pr, "PERSISTENCE_VERSION",
be32toh(prs->version_le)); "%d", be32_to_cpu(prs->version_le)) != 0)
blkid_probe_set_value(pr, "PERSISTENCE_VERSION", return errno ? -errno : 1;
persistence_version, l);
}
return 0; return 0;
} }