*: fix fallout from opt_complementary conversion

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/ntpd.c b/networking/ntpd.c
index 25fa443894a19716d1133e24b04764f29a893541..4f881eaf9534b62a2c498847e764047f4e479f17 100644 (file)
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv)
                        "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
                        IF_FEATURE_NTPD_SERVER("I:") /* compat */
                        "d" /* compat */
-                       "46aAbgL", /* compat, ignored */
+                       "46aAbgL" /* compat, ignored */
                                "\0"
                                "dd:wn"  /* -d: counter; -p: list; -w implies -n */
                                IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */

diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 8da47d274a377aae7d0b9cf987a7bc2d2e137aba..740eaf8fb24144dc30a48575d83b63cd1ea192d4 100644 (file)
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -613,19 +613,21 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
        /* Option order must match OPT_x definitions! */
        if (applet_name[0] == 'r') { /* restorecon */
                flags = getopt32(argv, "^"
-                       "de:*f:ilnpqrsvo:FWR",
-                       "\0" "vv:v--p:p--v:v--q:q--v";
+                       "de:*f:ilnpqrsvo:FWR"
+                               "\0"
+                               "vv:v--p:p--v:v--q:q--v",
                        &exclude_dir, &input_filename, &out_filename,
-                       &verbose
+                               &verbose
                );
        } else { /* setfiles */
                flags = getopt32(argv, "^"
                        "de:*f:ilnpqr:svo:FW"
-                       IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
-                       "\0" "vv:v--p:p--v:v--q:q--v";
+                       IF_FEATURE_SETFILES_CHECK_OPTION("c:")
+                               "\0"
+                               "vv:v--p:p--v:v--q:q--v",
                        &exclude_dir, &input_filename, &rootpath, &out_filename,
                        IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
-                       &verbose
+                               &verbose
                );
        }
        argv += optind;