oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: fold mpd_main_after_fork() into MainConfigured()

Browse Source
This commit is contained in:
Max Kellermann 2019-05-29 22:16:32 +02:00
parent fdbec694c6
commit efc6b1b77a
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Main.cxx
View File

@ -382,11 +382,6 @@ main(int argc, char *argv[]) noexcept
#endif #endif
static void
mpd_main_after_fork(Instance &instance,
const ConfigData &raw_config,
const Config &config);
static inline void static inline void
MainConfigured(const struct options &options, const ConfigData &raw_config) MainConfigured(const struct options &options, const ConfigData &raw_config)
{ {
@ -448,41 +443,6 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
AtScopeExit() { daemonize_finish(); }; AtScopeExit() { daemonize_finish(); };
#endif #endif
mpd_main_after_fork(instance, raw_config, config);
}
#ifndef ANDROID
static inline void
MainOrThrow(int argc, char *argv[])
{
struct options options;
ConfigData raw_config;
ParseCommandLine(argc, argv, options, raw_config);
MainConfigured(options, raw_config);
}
int mpd_main(int argc, char *argv[]) noexcept
{
AtScopeExit() { log_deinit(); };
try {
MainOrThrow(argc, argv);
return EXIT_SUCCESS;
} catch (...) {
LogError(std::current_exception());
return EXIT_FAILURE;
}
}
#endif /* !ANDROID */
static void
mpd_main_after_fork(Instance &instance,
const ConfigData &raw_config, const Config &config)
{
ConfigureFS(raw_config); ConfigureFS(raw_config);
AtScopeExit() { DeinitFS(); }; AtScopeExit() { DeinitFS(); };
@ -613,6 +573,34 @@ mpd_main_after_fork(Instance &instance,
instance.BeginShutdownPartitions(); instance.BeginShutdownPartitions();
} }
#ifndef ANDROID
static inline void
MainOrThrow(int argc, char *argv[])
{
struct options options;
ConfigData raw_config;
ParseCommandLine(argc, argv, options, raw_config);
MainConfigured(options, raw_config);
}
int mpd_main(int argc, char *argv[]) noexcept
{
AtScopeExit() { log_deinit(); };
try {
MainOrThrow(argc, argv);
return EXIT_SUCCESS;
} catch (...) {
LogError(std::current_exception());
return EXIT_FAILURE;
}
}
#endif /* !ANDROID */
#ifdef ANDROID #ifdef ANDROID
static void static void