[systemd-devel] [PATCH 2/2] bootchart: rewrite usage message more generally

[WaLyong Cho]

---
 src/bootchart/bootchart.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index a73418a..84497cc 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -209,22 +209,23 @@ static int parse_args(int argc, char *argv[]) {
                         arg_entropy = true;
                         break;
                 case 'h':
-                        fprintf(stderr, "Usage: %s [OPTIONS]\n", argv[0]);
-                        fprintf(stderr, " --rel,       -r          Record time relative to recording\n");
-                        fprintf(stderr, " --freq,      -f f        Sample frequency [%f]\n", arg_hz);
-                        fprintf(stderr, " --samples,   -n N        Stop sampling at [%d] samples\n", arg_samples_len);
-                        fprintf(stderr, " --scale-x,   -x N        Scale the graph horizontally [%f] \n", arg_scale_x);
-                        fprintf(stderr, " --scale-y,   -y N        Scale the graph vertically [%f] \n", arg_scale_y);
-                        fprintf(stderr, " --pss,       -p          Enable PSS graph (CPU intensive)\n");
-                        fprintf(stderr, " --entropy,   -e          Enable the entropy_avail graph\n");
-                        fprintf(stderr, " --output,    -o [PATH]   Path to output files [%s]\n", arg_output_path);
-                        fprintf(stderr, " --init,      -i [PATH]   Path to init executable [%s]\n", arg_init_path);
-                        fprintf(stderr, " --no-filter, -F          Disable filtering of processes from the graph\n");
-                        fprintf(stderr, "                          that are of less importance or short-lived\n");
-                        fprintf(stderr, " --cmdline,   -C          Display the full command line with arguments\n");
-                        fprintf(stderr, "                          of processes, instead of only the process name\n");
-                        fprintf(stderr, " --control-group, -c      Display process control group\n");
-                        fprintf(stderr, " --help,      -h          Display this message\n");
+                        fprintf(stderr, "Usage: %s [OPTIONS]\n\n", argv[0]);
+                        fprintf(stderr, "Options:\n");
+                        fprintf(stderr, "  -r, --rel              Record time relative to recording\n");
+                        fprintf(stderr, "  -f, --freq=FREQ        Sample frequency [%f]\n", arg_hz);
+                        fprintf(stderr, "  -n, --samples=N        Stop sampling at [%d] samples\n", arg_samples_len);
+                        fprintf(stderr, "  -x, --scale-x=N        Scale the graph horizontally [%f] \n", arg_scale_x);
+                        fprintf(stderr, "  -y, --scale-y=N        Scale the graph vertically [%f] \n", arg_scale_y);
+                        fprintf(stderr, "  -p, --pss              Enable PSS graph (CPU intensive)\n");
+                        fprintf(stderr, "  -e, --entropy          Enable the entropy_avail graph\n");
+                        fprintf(stderr, "  -o, --output=PATH      Path to output files [%s]\n", arg_output_path);
+                        fprintf(stderr, "  -i, --init=PATH        Path to init executable [%s]\n", arg_init_path);
+                        fprintf(stderr, "  -F, --no-filter        Disable filtering of processes from the graph\n");
+                        fprintf(stderr, "                           that are of less importance or short-lived\n");
+                        fprintf(stderr, "  -C, --cmdline          Display the full command line with arguments\n");
+                        fprintf(stderr, "                           of processes, instead of only the process name\n");
+                        fprintf(stderr, "  -c, --control-group    Display process control group\n");
+                        fprintf(stderr, "  -h, --help             Display this message\n\n");
                         fprintf(stderr, "See bootchart.conf for more information.\n");
                         exit (EXIT_SUCCESS);
                 default:
-- 
1.9.0