28 files changed, 74 insertions, 53 deletions
diff --git a/src/AudioConfig.hxx b/src/AudioConfig.hxx
index 430d2f26a..1056eb8ff 100644
--- a/src/AudioConfig.hxx
+++ b/src/AudioConfig.hxx
@@ -26,6 +26,7 @@ AudioFormat
 getOutputAudioFormat(AudioFormat inFormat);
 
 /* make sure initPlayerData is called before this function!! */
-void initAudioConfig(void);
+void
+initAudioConfig();
 
 #endif
diff --git a/src/IOThread.hxx b/src/IOThread.hxx
index 99dc696a7..c7edd67b4 100644
--- a/src/IOThread.hxx
+++ b/src/IOThread.hxx
@@ -25,7 +25,7 @@
 class EventLoop;
 
 void
-io_thread_init(void);
+io_thread_init();
 
 void
 io_thread_start();
@@ -36,7 +36,7 @@ io_thread_start();
  * only.
  */
 void
-io_thread_run(void);
+io_thread_run();
 
 /**
  * Ask the I/O thread to quit, but does not wait for it.  Usually, you
@@ -44,10 +44,10 @@ io_thread_run(void);
  * includes this.
  */
 void
-io_thread_quit(void);
+io_thread_quit();
 
 void
-io_thread_deinit(void);
+io_thread_deinit();
 
 gcc_const
 EventLoop &
@@ -58,6 +58,6 @@ io_thread_get();
  */
 gcc_pure
 bool
-io_thread_inside(void);
+io_thread_inside();
 
 #endif
diff --git a/src/Idle.hxx b/src/Idle.hxx
index 95773d8d1..cc89427ea 100644
--- a/src/Idle.hxx
+++ b/src/Idle.hxx
@@ -78,13 +78,13 @@ idle_add(unsigned flags);
  * Atomically reads and resets the global idle flags value.
  */
 unsigned
-idle_get(void);
+idle_get();
 
 /**
  * Get idle names
  */
 const char*const*
-idle_get_names(void);
+idle_get_names();
 
 /**
  * Parse an idle name and return its mask.  Returns 0 if the given
diff --git a/src/LogInit.hxx b/src/LogInit.hxx
index b29c0a847..30fcb8baa 100644
--- a/src/LogInit.hxx
+++ b/src/LogInit.hxx
@@ -37,10 +37,11 @@ bool
 log_init(bool verbose, bool use_stdout, Error &error);
 
 void
-log_deinit(void);
+log_deinit();
 
 void setup_log_output(bool use_stdout);
 
-int cycle_log_files(void);
+int
+cycle_log_files();
 
 #endif /* LOG_H */
diff --git a/src/Main.hxx b/src/Main.hxx
index 84a0c41a1..0229b788c 100644
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -61,7 +61,7 @@ win32_main(int argc, char *argv[]);
  * This function should be called just before entering main loop.
  */
 void
-win32_app_started(void);
+win32_app_started();
 
 /**
  * When running as a service reports to service control manager
@@ -71,7 +71,7 @@ win32_app_started(void);
  * This function should be called just after leaving main loop.
  */
 void
-win32_app_stopping(void);
+win32_app_stopping();
 
 #endif
 
diff --git a/src/Mapper.hxx b/src/Mapper.hxx
index ac07079f0..ca5d29810 100644
--- a/src/Mapper.hxx
+++ b/src/Mapper.hxx
@@ -36,7 +36,8 @@ class AllocatedPath;
 void
 mapper_init(AllocatedPath &&playlist_dir);
 
-void mapper_finish(void);
+void
+mapper_finish();
 
 #ifdef ENABLE_DATABASE
 
@@ -68,7 +69,7 @@ map_fs_to_utf8(Path path_fs);
  */
 gcc_const
 const AllocatedPath &
-map_spl_path(void);
+map_spl_path();
 
 /**
  * Maps a playlist name (without the ".m3u" suffix) to a file system
diff --git a/src/Permission.hxx b/src/Permission.hxx
index b77fef4e8..50edc1da4 100644
--- a/src/Permission.hxx
+++ b/src/Permission.hxx
@@ -28,8 +28,10 @@ static constexpr unsigned PERMISSION_ADMIN = 8;
 
 int getPermissionFromPassword(char const* password, unsigned* permission);
 
-unsigned getDefaultPermissions(void);
+unsigned
+getDefaultPermissions();
 
-void initPermissions(void);
+void
+initPermissions();
 
 #endif
diff --git a/src/PlaylistFile.hxx b/src/PlaylistFile.hxx
index eacc54be7..467307e61 100644
--- a/src/PlaylistFile.hxx
+++ b/src/PlaylistFile.hxx
@@ -36,7 +36,7 @@ extern bool playlist_saveAbsolutePaths;
  * Perform some global initialization, e.g. load configuration values.
  */
 void
-spl_global_init(void);
+spl_global_init();
 
 /**
  * Determines whether the specified string is a valid name for a
diff --git a/src/ReplayGainConfig.hxx b/src/ReplayGainConfig.hxx
index 1f36a28e5..986506d8b 100644
--- a/src/ReplayGainConfig.hxx
+++ b/src/ReplayGainConfig.hxx
@@ -29,14 +29,15 @@ extern float replay_gain_preamp;
 extern float replay_gain_missing_preamp;
 extern bool replay_gain_limit;
 
-void replay_gain_global_init(void);
+void
+replay_gain_global_init();
 
 /**
  * Returns the current replay gain mode as a machine-readable string.
  */
 gcc_pure
 const char *
-replay_gain_get_mode_string(void);
+replay_gain_get_mode_string();
 
 /**
  * Sets the replay gain mode, parsed from a string.
diff --git a/src/Stats.hxx b/src/Stats.hxx
index d3f24c632..c3f56286e 100644
--- a/src/Stats.hxx
+++ b/src/Stats.hxx
@@ -22,7 +22,8 @@
 
 class Client;
 
-void stats_global_init(void);
+void
+stats_global_init();
 
 void
 stats_invalidate();
diff --git a/src/archive/ArchiveList.hxx b/src/archive/ArchiveList.hxx
index 7efe03914..73d17dd13 100644
--- a/src/archive/ArchiveList.hxx
+++ b/src/archive/ArchiveList.hxx
@@ -39,9 +39,11 @@ const ArchivePlugin *
 archive_plugin_from_name(const char *name);
 
 /* this is where we "load" all the "plugins" ;-) */
-void archive_plugin_init_all(void);
+void
+archive_plugin_init_all();
 
 /* this is where we "unload" all the "plugins" */
-void archive_plugin_deinit_all(void);
+void
+archive_plugin_deinit_all();
 
 #endif
diff --git a/src/archive/ArchivePlugin.hxx b/src/archive/ArchivePlugin.hxx
index 87b1a6ba0..eaf2c83c1 100644
--- a/src/archive/ArchivePlugin.hxx
+++ b/src/archive/ArchivePlugin.hxx
@@ -32,13 +32,13 @@ struct ArchivePlugin {
 	 * have/need one this must false if there is an error and
 	 * true otherwise
 	 */
-	bool (*init)(void);
+	bool (*init)();
 
 	/**
 	 * optional, set this to nullptr if the archive plugin doesn't
 	 * have/need one
 	 */
-	void (*finish)(void);
+	void (*finish)();
 
 	/**
 	 * tryes to open archive file and associates handle with archive
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index bdfb1ef93..83909f68b 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -200,7 +200,8 @@ private:
 	virtual void OnTimeout() override;
 };
 
-void client_manager_init(void);
+void
+client_manager_init();
 
 void
 client_new(EventLoop &loop, Partition &partition,
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 0662cff64..bd232efda 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -257,7 +257,8 @@ handle_not_commands(Client &client, gcc_unused ConstBuffer<const char *> args)
 	return CommandResult::OK;
 }
 
-void command_init(void)
+void
+command_init()
 {
 #ifndef NDEBUG
 	/* ensure that the command list is sorted */
@@ -266,7 +267,8 @@ void command_init(void)
 #endif
 }
 
-void command_finish(void)
+void
+command_finish()
 {
 }
 
diff --git a/src/command/AllCommands.hxx b/src/command/AllCommands.hxx
index ce3b905c4..e3405b034 100644
--- a/src/command/AllCommands.hxx
+++ b/src/command/AllCommands.hxx
@@ -24,9 +24,11 @@
 
 class Client;
 
-void command_init(void);
+void
+command_init();
 
-void command_finish(void);
+void
+command_finish();
 
 CommandResult
 command_process(Client &client, unsigned num, char *line);
diff --git a/src/config/ConfigGlobal.hxx b/src/config/ConfigGlobal.hxx
index 3c6a938a6..9e8687e82 100644
--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
@@ -29,14 +29,18 @@ class AllocatedPath;
 struct config_param;
 struct ConfigBlock;
 
-void config_global_init(void);
-void config_global_finish(void);
+void
+config_global_init();
+
+void
+config_global_finish();
 
 /**
  * Call this function after all configuration has been evaluated.  It
  * checks for unused parameters, and logs warnings.
  */
-void config_global_check(void);
+void
+config_global_check();
 
 bool
 ReadConfigFile(Path path, Error &error);
diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx
index 7d56240ac..82b6cdf04 100644
--- a/src/db/update/InotifyUpdate.hxx
+++ b/src/db/update/InotifyUpdate.hxx
@@ -32,6 +32,6 @@ mpd_inotify_init(EventLoop &loop, Storage &storage, UpdateService &update,
 		 unsigned max_depth);
 
 void
-mpd_inotify_finish(void);
+mpd_inotify_finish();
 
 #endif
diff --git a/src/decoder/DecoderList.hxx b/src/decoder/DecoderList.hxx
index f44d96c67..26ecc51d7 100644
--- a/src/decoder/DecoderList.hxx
+++ b/src/decoder/DecoderList.hxx
@@ -34,10 +34,12 @@ const struct DecoderPlugin *
 decoder_plugin_from_name(const char *name);
 
 /* this is where we "load" all the "plugins" ;-) */
-void decoder_plugin_init_all(void);
+void
+decoder_plugin_init_all();
 
 /* this is where we "unload" all the "plugins" */
-void decoder_plugin_deinit_all(void);
+void
+decoder_plugin_deinit_all();
 
 template<typename F>
 static inline const DecoderPlugin *
diff --git a/src/decoder/DecoderPlugin.hxx b/src/decoder/DecoderPlugin.hxx
index 75cba6385..49e2facc9 100644
--- a/src/decoder/DecoderPlugin.hxx
+++ b/src/decoder/DecoderPlugin.hxx
@@ -50,7 +50,7 @@ struct DecoderPlugin {
 	 * Deinitialize a decoder plugin which was initialized
 	 * successfully.  Optional method.
 	 */
-	void (*finish)(void);
+	void (*finish)();
 
 	/**
 	 * Decode a stream (data read from an #InputStream object).
diff --git a/src/filter/plugins/ChainFilterPlugin.hxx b/src/filter/plugins/ChainFilterPlugin.hxx
index 708b62126..8f346e178 100644
--- a/src/filter/plugins/ChainFilterPlugin.hxx
+++ b/src/filter/plugins/ChainFilterPlugin.hxx
@@ -33,7 +33,7 @@ class Filter;
  * Creates a new filter chain.
  */
 Filter *
-filter_chain_new(void);
+filter_chain_new();
 
 /**
  * Appends a new filter at the end of the filter chain.  You must call
diff --git a/src/input/Init.hxx b/src/input/Init.hxx
index 4ad4ba577..eb4f8b1b2 100644
--- a/src/input/Init.hxx
+++ b/src/input/Init.hxx
@@ -31,6 +31,7 @@ input_stream_global_init(Error &error);
 /**
  * Deinitializes this library and all #InputStream implementations.
  */
-void input_stream_global_finish(void);
+void
+input_stream_global_finish();
 
 #endif
diff --git a/src/input/InputPlugin.hxx b/src/input/InputPlugin.hxx
index 9e83c2a5f..a7c19bef3 100644
--- a/src/input/InputPlugin.hxx
+++ b/src/input/InputPlugin.hxx
@@ -75,7 +75,7 @@ struct InputPlugin {
 	 * Global deinitialization.  Called once before MPD shuts
 	 * down (only if init() has returned true).
 	 */
-	void (*finish)(void);
+	void (*finish)();
 
 	InputStream *(*open)(const char *uri,
 			     Mutex &mutex, Cond &cond,
diff --git a/src/mixer/Volume.hxx b/src/mixer/Volume.hxx
index d5f3f09b1..8c693bfc7 100644
--- a/src/mixer/Volume.hxx
+++ b/src/mixer/Volume.hxx
@@ -49,6 +49,6 @@ save_sw_volume_state(BufferedOutputStream &os);
  */
 gcc_pure
 unsigned
-sw_volume_state_get_hash(void);
+sw_volume_state_get_hash();
 
 #endif
diff --git a/src/output/OutputPlugin.hxx b/src/output/OutputPlugin.hxx
index 63b774fd6..2f6869368 100644
--- a/src/output/OutputPlugin.hxx
+++ b/src/output/OutputPlugin.hxx
@@ -44,7 +44,7 @@ struct AudioOutputPlugin {
 	 * Test if this plugin can provide a default output, in case
 	 * none has been configured.  This method is optional.
 	 */
-	bool (*test_default_device)(void);
+	bool (*test_default_device)();
 
 	/**
 	 * Configure and initialize the device, but do not open it
diff --git a/src/output/OutputState.hxx b/src/output/OutputState.hxx
index 85066acdf..45076d59f 100644
--- a/src/output/OutputState.hxx
+++ b/src/output/OutputState.hxx
@@ -41,6 +41,6 @@ audio_output_state_save(BufferedOutputStream &os,
  * whether the state has changed and the state file should be saved.
  */
 unsigned
-audio_output_state_get_version(void);
+audio_output_state_get_version();
 
 #endif
diff --git a/src/playlist/PlaylistPlugin.hxx b/src/playlist/PlaylistPlugin.hxx
index adbf4b35d..ccc336a69 100644
--- a/src/playlist/PlaylistPlugin.hxx
+++ b/src/playlist/PlaylistPlugin.hxx
@@ -44,7 +44,7 @@ struct playlist_plugin {
 	 * Deinitialize a plugin which was initialized successfully.
 	 * Optional method.
 	 */
-	void (*finish)(void);
+	void (*finish)();
 
 	/**
 	 * Opens the playlist on the specified URI.  This URI has
diff --git a/src/playlist/PlaylistRegistry.hxx b/src/playlist/PlaylistRegistry.hxx
index c79718047..09e842b13 100644
--- a/src/playlist/PlaylistRegistry.hxx
+++ b/src/playlist/PlaylistRegistry.hxx
@@ -37,13 +37,13 @@ extern const struct playlist_plugin *const playlist_plugins[];
  * Initializes all playlist plugins.
  */
 void
-playlist_list_global_init(void);
+playlist_list_global_init();
 
 /**
  * Deinitializes all playlist plugins.
  */
 void
-playlist_list_global_finish(void);
+playlist_list_global_finish();
 
 /**
  * Opens a playlist by its URI.
diff --git a/src/unix/Daemon.hxx b/src/unix/Daemon.hxx
index 40db4e8d7..5937705ce 100644
--- a/src/unix/Daemon.hxx
+++ b/src/unix/Daemon.hxx
@@ -33,10 +33,10 @@ daemonize_init(const char *user, const char *group, AllocatedPath &&pidfile)
 
 #ifndef WIN32
 void
-daemonize_finish(void);
+daemonize_finish();
 #else
 static inline void
-daemonize_finish(void)
+daemonize_finish()
 { /* nop */ }
 #endif
 
@@ -46,11 +46,11 @@ daemonize_finish(void)
  */
 #ifndef WIN32
 void
-daemonize_kill(void);
+daemonize_kill();
 #else
 #include "system/FatalError.hxx"
 static inline void
-daemonize_kill(void)
+daemonize_kill()
 {
 	FatalError("--kill is not available on WIN32");
 }
@@ -61,10 +61,10 @@ daemonize_kill(void)
  */
 #ifndef WIN32
 void
-daemonize_close_stdin(void);
+daemonize_close_stdin();
 #else
 static inline void
-daemonize_close_stdin(void) {}
+daemonize_close_stdin() {}
 #endif
 
 /**
@@ -72,10 +72,10 @@ daemonize_close_stdin(void) {}
  */
 #ifndef WIN32
 void
-daemonize_set_user(void);
+daemonize_set_user();
 #else
 static inline void
-daemonize_set_user(void)
+daemonize_set_user()
 { /* nop */ }
 #endif