tools: lxc-wait: add default log priority & cleanups

src/lxc/tools/lxc_wait.c

@@ -37,25 +37,8 @@
 
 lxc_log_define(lxc_wait, lxc);
 
-static int my_checker(const struct lxc_arguments *args)
-{
-	if (!args->states) {
-		ERROR("Missing state option to wait for");
-		return -1;
-	}
-
-	return 0;
-}
-
-static int my_parser(struct lxc_arguments *args, int c, char *arg)
-{
-	switch (c) {
-	case 's': args->states = optarg; break;
-	case 't': args->timeout = atol(optarg); break;
-	}
-
-	return 0;
-}
+static int my_parser(struct lxc_arguments *args, int c, char *arg);
+static int my_checker(const struct lxc_arguments *args);
 
 static const struct option my_longopts[] = {
 	{"state", required_argument, 0, 's'},
@@ -80,9 +63,35 @@ Options :\n\
 	.options      = my_longopts,
 	.parser       = my_parser,
 	.checker      = my_checker,
+	.log_priority = "ERROR",
+	.log_file     = "none",
 	.timeout      = -1,
 };
 
+static int my_parser(struct lxc_arguments *args, int c, char *arg)
+{
+	switch (c) {
+	case 's':
+		args->states = optarg;
+		break;
+	case 't':
+		args->timeout = atol(optarg);
+		break;
+	}
+
+	return 0;
+}
+
+static int my_checker(const struct lxc_arguments *args)
+{
+	if (!args->states) {
+		ERROR("Missing state option to wait for");
+		return -1;
+	}
+
+	return 0;
+}
+
 int main(int argc, char *argv[])
 {
 	struct lxc_container *c;
@@ -91,8 +100,6 @@ int main(int argc, char *argv[])
 	if (lxc_arguments_parse(&my_args, argc, argv))
 		exit(EXIT_FAILURE);
 
-	/* Only create log if explicitly instructed */
-	if (my_args.log_file || my_args.log_priority) {
 	log.name = my_args.name;
 	log.file = my_args.log_file;
 	log.level = my_args.log_priority;
@@ -102,7 +109,6 @@ int main(int argc, char *argv[])
 
 	if (lxc_log_init(&log))
 		exit(EXIT_FAILURE);
-	}
 
 	c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
 	if (!c)