[PATCH 1/2] tools: Reformat --help output of virsh and virt-admin

Michal Privoznik mprivozn at redhat.com
Mon Sep 4 08:31:47 UTC 2023


The --help output of virsh and virt-admin shows supported options
and commands and as such contains new lines. Both these strings
are marked for translation btw. But the way they are formatted
now ('\n' being at the start of new line instead at the end of
the previous) makes it hard to create a syntax-check rule for
'translation message on one line' (next commit).

Reformat both strings a bit (no user visible change though).

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tools/virsh.c      | 6 ++++--
 tools/virt-admin.c | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index d9922a35fc..7b71131db3 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -436,8 +436,10 @@ virshUsage(void)
     const vshCmdGrp *grp;
     const vshCmdDef *cmd;
 
-    fprintf(stdout, _("\n%1$s [options]... [<command_string>]"
-                      "\n%2$s [options]... <command> [args...]\n\n"
+    fprintf(stdout, _("\n"
+                      "%1$s [options]... [<command_string>]\n"
+                      "%2$s [options]... <command> [args...]\n"
+                      "\n"
                       "  options:\n"
                       "    -c | --connect=URI      hypervisor connection URI\n"
                       "    -d | --debug=NUM        debug level [0-4]\n"
diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 15a639f1ea..1e22a3c8a9 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1242,8 +1242,10 @@ vshAdmUsage(void)
     const vshCmdGrp *grp;
     const vshCmdDef *cmd;
 
-    fprintf(stdout, _("\n%1$s [options]... [<command_string>]"
-                      "\n%2$s [options]... <command> [args...]\n\n"
+    fprintf(stdout, _("\n"
+                      "%1$s [options]... [<command_string>]\n"
+                      "%2$s [options]... <command> [args...]\n"
+                      "\n"
                       "  options:\n"
                       "    -c | --connect=URI      daemon admin connection URI\n"
                       "    -d | --debug=NUM        debug level [0-4]\n"
-- 
2.41.0



More information about the libvir-list mailing list