Simplify logic to create 'attr' strings.

This patch addresses code review request to simplify creation of 'attr'
strings.  The simplification is done in this separate patch to more
easily review and ensure the simplification is done without error.

diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 0c01c73d5039d0846a911b7c5f1f87459214ac78..6abcdabb3f878669750ac63effd58bcfaf152858 100644 (file)
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -61,28 +61,16 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
                repstr[0] = 'v';
        /* Origin takes precedence over Mirror */
        else if (lv_is_origin(lv)) {
-               if (lv_is_merging_origin(lv))
-                       repstr[0] = 'O';
-               else
-                       repstr[0] = 'o';
+               repstr[0] = (lv_is_merging_origin(lv)) ? 'O' : 'o';
        }
        else if (lv->status & MIRRORED) {
-               if (lv->status & MIRROR_NOTSYNCED)
-                       repstr[0] = 'M';
-               else
-                       repstr[0] = 'm';
+               repstr[0] = (lv->status & MIRROR_NOTSYNCED) ? 'M' : 'm';
        }else if (lv->status & MIRROR_IMAGE)
-               if (_lv_mimage_in_sync(lv))
-                       repstr[0] = 'i';
-               else
-                       repstr[0] = 'I';
+               repstr[0] = (_lv_mimage_in_sync(lv)) ? 'i' : 'I';
        else if (lv->status & MIRROR_LOG)
                repstr[0] = 'l';
        else if (lv_is_cow(lv)) {
-               if (lv_is_merging_cow(lv))
-                       repstr[0] = 'S';
-               else
-                       repstr[0] = 's';
+               repstr[0] = (lv_is_merging_cow(lv)) ? 'S' : 's';
        } else
                repstr[0] = '-';
 
@@ -100,10 +88,7 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
        if (lv->status & LOCKED)
                repstr[2] = toupper(repstr[2]);
 
-       if (lv->status & FIXED_MINOR)
-               repstr[3] = 'm';        /* Fixed Minor */
-       else
-               repstr[3] = '-';
+       repstr[3] = (lv->status & FIXED_MINOR) ? 'm' : '-';
 
        if (lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) && info.exists) {
                if (info.suspended)
@@ -126,10 +111,7 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
                                repstr[4] = 'I'; /* Invalid snapshot */
                }
 
-               if (info.open_count)
-                       repstr[5] = 'o';        /* Open */
-               else
-                       repstr[5] = '-';
+               repstr[5] = (info.open_count) ? 'o' : '-';
        } else {
                repstr[4] = '-';
                repstr[5] = '-';

diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c
index 7c603e112ec3a20554724553b72a8a30c5b531cf..a21b7d67c96aad7f6fc8bf9fef65bf635b225420 100644 (file)
--- a/lib/metadata/pv.c
+++ b/lib/metadata/pv.c
@@ -172,15 +172,8 @@ char *pv_attr_dup(struct dm_pool *mem, const struct physical_volume *pv)
                return NULL;
        }
 
-       if (pv->status & ALLOCATABLE_PV)
-               repstr[0] = 'a';
-       else
-               repstr[0] = '-';
-
-       if (pv->status & EXPORTED_VG)
-               repstr[1] = 'x';
-       else
-               repstr[1] = '-';
+       repstr[0] = (pv->status & ALLOCATABLE_PV) ? 'a' : '-';
+       repstr[1] = (pv->status & EXPORTED_VG) ? 'x' : '-';
        return repstr;
 }
 

diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c
index 3315c7e1d8c43e5c5304c47aa724d82bffaec642..07cb60abfe74be0e25404bfb7f782bf273d091e1 100644 (file)
--- a/lib/metadata/vg.c
+++ b/lib/metadata/vg.c
@@ -443,31 +443,11 @@ char *vg_attr_dup(struct dm_pool *mem, const struct volume_group *vg)
                return NULL;
        }
 
-       if (vg->status & LVM_WRITE)
-               repstr[0] = 'w';
-       else
-               repstr[0] = 'r';
-
-       if (vg_is_resizeable(vg))
-               repstr[1] = 'z';
-       else
-               repstr[1] = '-';
-
-       if (vg_is_exported(vg))
-               repstr[2] = 'x';
-       else
-               repstr[2] = '-';
-
-       if (vg_missing_pv_count(vg))
-               repstr[3] = 'p';
-       else
-               repstr[3] = '-';
-
+       repstr[0] = (vg->status & LVM_WRITE) ? 'w' : 'r';
+       repstr[1] = (vg_is_resizeable(vg)) ? 'z' : '-';
+       repstr[2] = (vg_is_exported(vg)) ? 'x' : '-';
+       repstr[3] = (vg_missing_pv_count(vg)) ? 'p' : '-';
        repstr[4] = alloc_policy_char(vg->alloc);
-
-       if (vg_is_clustered(vg))
-               repstr[5] = 'c';
-       else
-               repstr[5] = '-';
+       repstr[5] = (vg_is_clustered(vg)) ? 'c' : '-';
        return repstr;
 }