From d2b8ea6b81979dd25a8bab77c629499b988d7bae Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 7 May 2011 11:46:49 -0400 Subject: [PATCH 1/1] Prettify usage() Signed-off-by: Mathieu Desnoyers --- converter/babeltrace.c | 4 ++-- formats/registry.c | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 2e731712..ce7664a8 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -77,8 +77,8 @@ static void usage(FILE *fp) fprintf(fp, " INPUT Input trace path\n"); fprintf(fp, " OUTPUT Output trace path (default: stdout)\n"); fprintf(fp, "\n"); - fprintf(fp, " -i, --input-format FORMAT Input trace format\n"); - fprintf(fp, " -o, --output-format FORMAT Output trace format\n"); + fprintf(fp, " -i, --input-format FORMAT Input trace format (default: ctf)\n"); + fprintf(fp, " -o, --output-format FORMAT Output trace format (default: text)\n"); fprintf(fp, "\n"); fprintf(fp, " -h, --help This help message\n"); fprintf(fp, " -l, --list List available formats\n"); diff --git a/formats/registry.c b/formats/registry.c index a6fd74b2..656d6360 100644 --- a/formats/registry.c +++ b/formats/registry.c @@ -21,6 +21,11 @@ #include #include +struct walk_data { + FILE *fp; + int iter; +}; + static int init_done; void __attribute__((constructor)) format_init(void); void __attribute__((destructor)) format_finalize(void); @@ -42,19 +47,27 @@ struct format *bt_lookup_format(GQuark qname) static void show_format(gpointer key, gpointer value, gpointer user_data) { - FILE *fp = user_data; + struct walk_data *data = user_data; - fprintf(fp, "format: %s\n", + fprintf(data->fp, "%s%s", data->iter ? ", " : "", g_quark_to_string((GQuark) (unsigned long) key)); + data->iter++; } void bt_fprintf_format_list(FILE *fp) { - fprintf(fp, "Formats available:\n"); + struct walk_data data; + + data.fp = fp; + data.iter = 0; + + fprintf(fp, "Formats available: "); if (!init_done) return; - g_hash_table_foreach(format_registry, show_format, fp); - fprintf(fp, "End of formats available.\n"); + g_hash_table_foreach(format_registry, show_format, &data); + if (data.iter == 0) + fprintf(fp, ""); + fprintf(fp, ".\n"); } int bt_register_format(struct format *format) -- 2.34.1