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

Main: move two more functions down

Browse Source
This commit is contained in:
Max Kellermann 2019-05-29 22:20:02 +02:00
parent d17ff18ec0
commit 7c565bce1d
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Main.cxx
View File

@ -559,34 +559,6 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
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
static void
@ -640,6 +612,30 @@ Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
#else
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;
}
}
int
main(int argc, char *argv[]) noexcept
{