X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm-control.c;h=0447804c95fb5a697dda079da7918f7fb3b15719;hb=b6a49cd681ac3ffd0702a79741fb482db85b5a36;hp=0fd69b9a0aafdcebfc930c2b817577714dfd874e;hpb=ca508dd94dc785492b5c62f56b02c0eeb3775f38;p=elogind.git

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 0fd69b9a0..0447804c9 100644
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -35,7 +35,7 @@ static void print_help(void)
 		"  --start-exec-queue       execute events, flush queue\n"
 		"  --reload-rules           reloads the rules files\n"
 		"  --property=<KEY>=<value> set a global property for all events\n"
-		"  --max-childs=<N>         maximum number of childs\n"
+		"  --children-max=<N>       maximum number of children\n"
 		"  --help                   print this help text\n\n");
 }
 
@@ -44,7 +44,6 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 	struct udev_ctrl *uctrl = NULL;
 	int rc = 1;
 
-	/* compat values with '_' will be removed in a future release */
 	static const struct option options[] = {
 		{ "log-priority", required_argument, NULL, 'l' },
 		{ "stop-exec-queue", no_argument, NULL, 's' },
@@ -52,7 +51,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 		{ "reload-rules", no_argument, NULL, 'R' },
 		{ "property", required_argument, NULL, 'p' },
 		{ "env", required_argument, NULL, 'p' },
-		{ "max-childs", required_argument, NULL, 'm' },
+		{ "children-max", required_argument, NULL, 'm' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
@@ -66,12 +65,12 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 	if (uctrl == NULL)
 		return 2;
 
-	while (1) {
+	for (;;) {
 		int option;
 		int i;
 		char *endp;
 
-		option = getopt_long(argc, argv, "l:sSRp:m:M:h", options, NULL);
+		option = getopt_long(argc, argv, "l:sSRp:m:h", options, NULL);
 		if (option == -1)
 			break;
 
@@ -121,7 +120,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
 				fprintf(stderr, "invalid number '%s'\n", optarg);
 				goto exit;
 			}
-			if (udev_ctrl_send_set_max_childs(uctrl, i) < 0)
+			if (udev_ctrl_send_set_children_max(uctrl, i) < 0)
 				rc = 2;
 			else
 				rc = 0;