cleanup: rename func

Update name of function read_and_validate_major_minor
and put it into the right header file toollib.h.

(In release update for f09f85d027)

tools/lvchange.c

@@ -542,7 +542,7 @@ static int lvchange_persistent(struct cmd_context *cmd,
 {
 	enum activation_change activate = CHANGE_AN;
 
-	if (!read_and_validate_major_minor(cmd, lv->vg->fid->fmt,
+	if (!get_and_validate_major_minor(cmd, lv->vg->fid->fmt,
 					  &lv->major, &lv->minor))
 		return_0;
 

tools/lvcreate.c

@@ -767,7 +767,7 @@ static int _read_activation_params(struct lvcreate_params *lp,
 			return 0;
 		}
 
-		if (!read_and_validate_major_minor(cmd, vg->fid->fmt,
+		if (!get_and_validate_major_minor(cmd, vg->fid->fmt,
 						  &lp->major, &lp->minor))
                         return_0;
 	} else if (arg_is_set(cmd, major_ARG) || arg_is_set(cmd, minor_ARG)) {

tools/lvmcmdline.c

@@ -576,60 +576,6 @@ int metadatacopies_arg(struct cmd_context *cmd, struct arg_values *av)
 	return int_arg(cmd, av);
 }
 
-int read_and_validate_major_minor(const struct cmd_context *cmd,
-				  const struct format_type *fmt,
-				  int32_t *major, int32_t *minor)
-{
-	if (strcmp(arg_str_value(cmd, persistent_ARG, "n"), "y")) {
-		if (arg_is_set(cmd, minor_ARG) || arg_is_set(cmd, major_ARG)) {
-			log_error("--major and --minor incompatible with -Mn");
-			return 0;
-		}
-		*major = *minor = -1;
-		return 1;
-	}
-
-	if (arg_count(cmd, minor_ARG) > 1) {
-		log_error("Option --minor may not be repeated.");
-		return 0;
-	}
-
-	if (arg_count(cmd, major_ARG) > 1) {
-		log_error("Option -j/--major may not be repeated.");
-		return 0;
-	}
-
-	if (!strncmp(cmd->kernel_vsn, "2.4.", 4)) {
-		/* Major is required for 2.4 */
-		if (!arg_is_set(cmd, major_ARG)) {
-			log_error("Please specify major number with "
-				  "--major when using -My");
-			return 0;
-		}
-		*major = arg_int_value(cmd, major_ARG, -1);
-	} else {
-		if (arg_is_set(cmd, major_ARG)) {
-			log_warn("WARNING: Ignoring supplied major number - "
-				 "kernel assigns major numbers dynamically. "
-				 "Using major number %d instead.",
-				 cmd->dev_types->device_mapper_major);
-		}
-		*major = cmd->dev_types->device_mapper_major;
-	}
-
-	if (!arg_is_set(cmd, minor_ARG)) {
-		log_error("Please specify minor number with --minor when using -My.");
-		return 0;
-	}
-
-	*minor = arg_int_value(cmd, minor_ARG, -1);
-
-	if (!validate_major_minor(cmd, fmt, *major, *minor))
-		return_0;
-
-	return 1;
-}
-
 static void __alloc(int size)
 {
 	if (!(_cmdline.commands = dm_realloc(_cmdline.commands, sizeof(*_cmdline.commands) * size))) {

tools/toollib.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -1895,3 +1895,57 @@ int process_each_label(struct cmd_context *cmd, int argc, char **argv, void *han
 
 	return ret_max;
 }
+
+int get_and_validate_major_minor(const struct cmd_context *cmd,
+				 const struct format_type *fmt,
+				 int32_t *major, int32_t *minor)
+{
+	if (strcmp(arg_str_value(cmd, persistent_ARG, "n"), "y")) {
+		if (arg_is_set(cmd, minor_ARG) || arg_is_set(cmd, major_ARG)) {
+			log_error("--major and --minor incompatible with -Mn");
+			return 0;
+		}
+		*major = *minor = -1;
+		return 1;
+	}
+
+	if (arg_count(cmd, minor_ARG) > 1) {
+		log_error("Option --minor may not be repeated.");
+		return 0;
+	}
+
+	if (arg_count(cmd, major_ARG) > 1) {
+		log_error("Option -j/--major may not be repeated.");
+		return 0;
+	}
+
+	if (!strncmp(cmd->kernel_vsn, "2.4.", 4)) {
+		/* Major is required for 2.4 */
+		if (!arg_is_set(cmd, major_ARG)) {
+			log_error("Please specify major number with "
+				  "--major when using -My");
+			return 0;
+		}
+		*major = arg_int_value(cmd, major_ARG, -1);
+	} else {
+		if (arg_is_set(cmd, major_ARG)) {
+			log_warn("WARNING: Ignoring supplied major number - "
+				 "kernel assigns major numbers dynamically. "
+				 "Using major number %d instead.",
+				 cmd->dev_types->device_mapper_major);
+		}
+		*major = cmd->dev_types->device_mapper_major;
+	}
+
+	if (!arg_is_set(cmd, minor_ARG)) {
+		log_error("Please specify minor number with --minor when using -My.");
+		return 0;
+	}
+
+	*minor = arg_int_value(cmd, minor_ARG, -1);
+
+	if (!validate_major_minor(cmd, fmt, *major, *minor))
+		return_0;
+
+	return 1;
+}

tools/toollib.h

@@ -140,4 +140,8 @@ int get_stripe_params(struct cmd_context *cmd, uint32_t *stripes,
 int change_tag(struct cmd_context *cmd, struct volume_group *vg,
 	       struct logical_volume *lv, struct physical_volume *pv, int arg);
 
+int get_and_validate_major_minor(const struct cmd_context *cmd,
+				 const struct format_type *fmt,
+				 int32_t *major, int32_t *minor);
+
 #endif

tools/tools.h

@@ -138,9 +138,6 @@ int segtype_arg(struct cmd_context *cmd, struct arg_values *av);
 int alloc_arg(struct cmd_context *cmd, struct arg_values *av);
 int readahead_arg(struct cmd_context *cmd, struct arg_values *av);
 int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
-int read_and_validate_major_minor(const struct cmd_context *cmd,
-				  const struct format_type *fmt,
-				  int32_t *major, int32_t *minor);
 
 /* we use the enums to access the switches */
 unsigned arg_count(const struct cmd_context *cmd, int a);