From 36f0bd432c8ccd367696ebd5609f064f9e548e86 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Dec 2014 18:30:02 +0100 Subject: CommandLine: merge printf() calls --- src/CommandLine.cxx | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 181d5004c..385729cf6 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -107,10 +107,10 @@ static void version(void) "Copyright (C) 2003-2007 Warren Dukes \n" "Copyright (C) 2008-2014 Max Kellermann \n" "This is free software; see the source for copying conditions. There is NO\n" - "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); + "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" #ifdef ENABLE_DATABASE - printf("\n" + "\n" "Database plugins:\n"); for (auto i = database_plugins; *i != nullptr; ++i) @@ -121,16 +121,20 @@ static void version(void) for (auto i = storage_plugins; *i != nullptr; ++i) printf(" %s", (*i)->name); + + printf("\n" #endif #ifdef ENABLE_NEIGHBOR_PLUGINS - printf("\n\n" + "\n" "Neighbor plugins:\n"); for (auto i = neighbor_plugins; *i != nullptr; ++i) printf(" %s", (*i)->name); + + printf("\n" #endif - printf("\n\n" + "\n" "Decoders plugins:\n"); decoder_plugins_for_each([](const DecoderPlugin &plugin){ @@ -153,18 +157,18 @@ static void version(void) "Output plugins:\n"); audio_output_plugins_for_each(plugin) printf(" %s", plugin->name); - printf("\n"); + printf("\n" #ifdef ENABLE_ENCODER - printf("\n" + "\n" "Encoder plugins:\n"); encoder_plugins_for_each(plugin) printf(" %s", plugin->name); - printf("\n"); + printf("\n" #endif #ifdef ENABLE_ARCHIVE - printf("\n" + "\n" "Archive plugins:\n"); archive_plugins_for_each(plugin) { printf(" [%s]", plugin->name); @@ -176,9 +180,11 @@ static void version(void) printf("\n"); } + + printf("" #endif - printf("\n" + "\n" "Input plugins:\n"); input_plugins_for_each(plugin) printf(" %s", plugin->name); -- cgit v1.2.3