From 9458a9da09696d0a39476512e54ab52ca68cfdf7 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 29 Mar 2011 21:57:56 +0000 Subject: [PATCH] Use id_equal instead of strncmp() More consistent and easier to read. --- WHATS_NEW | 1 + lib/metadata/metadata.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b7c7622e3..28dececc3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.85 - =================================== + Replace several strncmp() calls with id_equal(). Fix lvmcache_info transfer to orphan_vginfo in _lvmcache_update_vgname(). Fix -Wold-style-definition gcc warnings. Fixes for lvconvert (including --repair) of temporary mirror stacks. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index cdd6089f5..4e46385a4 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3043,8 +3043,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, continue; } - if (strncmp((char *)vg->id.uuid, - (char *)correct_vg->id.uuid, ID_LEN)) { + if (!id_equal(&vg->id, &correct_vg->id)) { inconsistent = 1; inconsistent_vgid = 1; } @@ -3292,7 +3291,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, vginfo->vgname && !is_orphan_vg(vginfo->vgname)) { if ((vg = _vg_read(cmd, NULL, vgid, 1, &consistent, precommitted)) && - !strncmp((char *)vg->id.uuid, vgid, ID_LEN)) { + id_equal(&vg->id, (const struct id *)vgid)) { if (!consistent) log_error("Volume group %s metadata is " "inconsistent", vg->name); @@ -3323,7 +3322,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, consistent = 0; if ((vg = _vg_read(cmd, vgname, vgid, 1, &consistent, precommitted)) && - !strncmp((char *)vg->id.uuid, vgid, ID_LEN)) { + id_equal(&vg->id, (const struct id *)vgid)) { if (!consistent) { log_error("Volume group %s metadata is " "inconsistent", vgname); -- 2.43.5