From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Mon, 11 Mar 2024 12:34:34 +0000 (+0100)
Subject: tree-wide: drop custom formatting for print() help messages
X-Git-Tag: v256-rc1~573^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65064e2ff050fcf0daeefb4c1d03ba77c6b7f79b;p=thirdparty%2Fsystemd.git

tree-wide: drop custom formatting for print() help messages

Follow-up for bc556335b1c568c98688cc1f586b5f753fcddac6
---

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 02e317ad2d5..4af5f287219 100644
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -742,12 +742,13 @@ static int verb_help(int argc, char **argv, void *userdata) {
                "     --user               Select user-scoped credential encryption\n"
                "     --uid=UID            Select user for scoped credentials\n"
                "  -q --quiet              Suppress output for 'has-tpm2' verb\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }
diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index b0585ba5467..a415d54084a 100644
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -24,12 +24,14 @@ static int help(const char *program_path, const char *service, const char *descr
                "  -h --help                 Show this help\n"
                "     --version              Show package version\n"
                "     --bus-introspect=PATH  Write D-Bus XML introspection data\n"
-               "\nSee the %s for details.\n"
-               , program_path
-               , ansi_highlight(), description, ansi_normal()
-               , ansi_underline(), ansi_normal()
-               , link
-        );
+               "\nSee the %s for details.\n",
+               program_path,
+               ansi_highlight(),
+               description,
+               ansi_normal(),
+               ansi_underline(),
+               ansi_normal(),
+               link);
 
         return 0; /* No further action */
 }
diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 2b88785e9fe..b55383ee39a 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -1221,12 +1221,13 @@ static int verb_help(int argc, char **argv, void *userdata) {
                "     --no-legend          Do not show the headers and footers\n"
                "     --json=pretty|short|off\n"
                "                          Generate JSON output\n"
-               "\nSee the %2$s for details.\n"
-               , program_invocation_short_name
-               , link
-               , ansi_underline(), ansi_normal()
-               , ansi_highlight(), ansi_normal()
-        );
+               "\nSee the %2$s for details.\n",
+               program_invocation_short_name,
+               link,
+               ansi_underline(),
+               ansi_normal(),
+               ansi_highlight(),
+               ansi_normal());
 
         return 0;
 }