From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 24 Apr 2016 15:31:19 +0000 (-0400)
Subject: machinectl: simplify option string assignment
X-Git-Tag: v230~115^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bf50960493787a76d542356a93bb22f22af8072;p=thirdparty%2Fsystemd.git

machinectl: simplify option string assignment

It's better to avoid having the option string duplicated, lest we forget
to modify them in sync in the future.
---

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index b03198bbf1e..5a68c4ceb27 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2516,14 +2516,9 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argv);
 
         for (;;) {
-                const char *option_string;
+                const char * const option_string = "+hp:als:H:M:qn:o:";
 
-                if (reorder)
-                        option_string = "hp:als:H:M:qn:o:";
-                else
-                        option_string = "+hp:als:H:M:qn:o:";
-
-                c = getopt_long(argc, argv, option_string, options, NULL);
+                c = getopt_long(argc, argv, option_string + reorder, options, NULL);
                 if (c < 0) {
                         /* We generally are fine with the fact that getopt_long() reorders the command line, and looks
                          * for switches after the main verb. However, for "shell" we really don't want that, since we