cleanup: move test for free arg

Move test for list of volumes into common place.

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index e369def8a46e1e0a8a354f7ef6ef9d3eb75e01ab..9c25bd9514f44968c328d9e80317b2c151f5ed91 100644 (file)
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -110,8 +110,13 @@ static int _lvconvert_name_params(struct lvconvert_params *lp,
        char *ptr;
        const char *vg_name = NULL;
 
-       if (lp->merge)
+       if (lp->merge) {
+               if (!*pargc) {
+                       log_error("Please specify a logical volume path.");
+                       return 0;
+               }
                return 1;
+       }
 
        if (!*pargc) {
                if (lp->cache) {
@@ -3317,14 +3322,9 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
                return EINVALID_CMD_LINE;
        }
 
-       if (lp.merge) {
-               if (!argc) {
-                       log_error("Please provide logical volume path");
-                       return EINVALID_CMD_LINE;
-               }
+       if (lp.merge)
                return process_each_lv(cmd, argc, argv, READ_FOR_UPDATE, &lp,
                                       &_lvconvert_merge_single);
-       }
 
        return lvconvert_single(cmd, &lp);
 }