aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-08 18:30:02 +0100
committerMax Kellermann <max@duempel.org>2014-12-08 18:31:30 +0100
commit36f0bd432c8ccd367696ebd5609f064f9e548e86 (patch)
tree79604dc01fbd9d611ad86a9754b98c1fc08b96fb
parent457ab8b2cee065cf5430059bdeb883d2f5f3f16c (diff)
downloadmpd-36f0bd432c8ccd367696ebd5609f064f9e548e86.tar.gz
mpd-36f0bd432c8ccd367696ebd5609f064f9e548e86.tar.xz
mpd-36f0bd432c8ccd367696ebd5609f064f9e548e86.zip
CommandLine: merge printf() calls
-rw-r--r--src/CommandLine.cxx24
1 files 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 <warren.dukes@gmail.com>\n"
"Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>\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);