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

Main: move code to MainOrThrow(), leaving exception handler in mpd_main()

Browse Source
This commit is contained in:
Max Kellermann 2018-08-01 20:13:27 +02:00
parent 8d2101ccb4
commit 271e49db5d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Main.cxx
View File

@ -446,11 +446,9 @@ int main(int argc, char *argv[])
static int static int
mpd_main_after_fork(const ConfigData &raw_config, const Config &config); mpd_main_after_fork(const ConfigData &raw_config, const Config &config);
#ifdef ANDROID static inline int
static inline MainOrThrow(int argc, char *argv[])
#endif {
int mpd_main(int argc, char *argv[])
try {
struct options options; struct options options;
#ifdef ENABLE_DAEMON #ifdef ENABLE_DAEMON
@ -529,10 +527,19 @@ try {
#endif #endif
return mpd_main_after_fork(raw_config, config); return mpd_main_after_fork(raw_config, config);
}
} catch (const std::exception &e) { #ifdef ANDROID
LogError(e); static inline
return EXIT_FAILURE; #endif
int mpd_main(int argc, char *argv[])
{
try {
return MainOrThrow(argc, argv);
} catch (const std::exception &e) {
LogError(e);
return EXIT_FAILURE;
}
} }
static int static int