Commit bdb1965b authored by Eugeny N Dzhurinsky's avatar Eugeny N Dzhurinsky Committed by Max Kellermann

cmdline: renamed options.stderr to options.log_stderr

On FreeBSD, "stderr" is a macro, and using this name for a struct member breaks the build. [mk: renamed _stderr to log_stderr]
parent c9d43b4d
sisyphus 0.23.15-alt1 0.23.14-alt1 0.23.13-alt1 0.23.12-alt1 0.23.11-alt1 0.23.8-alt3 0.23.8-alt2 0.23.8-alt1 0.21.24-alt1.1 0.21.24-alt1 0.20.23-alt3 0.20.23-alt2 0.20.23-alt1 0.20.21-alt1 0.20.15-alt1 0.18.14-alt1 0.18.11-alt1.1 0.18.11-alt1 0.18.10-alt1 0.17.0-alt0.3.git050212 0.17.0-alt0.2.git200911 0.17.0-alt0.2.M60P.1.git050212 0.17.0-alt0.1 0.16.2-alt2 0.16.2-alt1 v0.18.14 v0.18.13 v0.18.12 v0.18.11 v0.18.10 v0.18.9 v0.18.8 v0.18.7 v0.18.6 v0.18.5 v0.18.4 v0.18.3 v0.18.2 v0.17.3 v0.17.2 v0.17.1 v0.17.0-git200911 v0.17.0-git200711 v0.17.0-git050212 v0.16.8 v0.16.5 v0.16.4 v0.16.3 v0.16.2 v0.16.1 v0.16 v0.16_alpha4 v0.16_alpha3 v0.16_alpha2 release-0.16.5 release-0.16.4 release-0.16.3 release-0.16.1 release-0.16 release-0.16_alpha4 release-0.16_alpha3 release-0.16_alpha2 mpd/0.20.6-alt1 mpd/0.19.9-alt1 mpd/0.18.14-alt2 gb-sisyphus-task339776.6100 gb-sisyphus-task337393.100 gb-sisyphus-task337176.300 gb-sisyphus-task334590.100 gb-sisyphus-task333607.100 gb-sisyphus-task331543.2500 gb-sisyphus-task328663.4700 gb-sisyphus-task325064.100 gb-sisyphus-task319111.4000 gb-sisyphus-task313704.100 gb-sisyphus-task312885.100 gb-sisyphus-task308905.3200 gb-sisyphus-task305294.500 gb-sisyphus-task304007.100 gb-sisyphus-task303674.1700 gb-sisyphus-task298681.300 gb-sisyphus-task296051.1000 gb-sisyphus-task274827.100 gb-sisyphus-task269249.2000 gb-sisyphus-task266579.400 gb-sisyphus-task258132.600 gb-sisyphus-task254601.200 gb-sisyphus-task253310.100 gb-sisyphus-task252214.300 gb-sisyphus-task251539.6100 gb-sisyphus-task247988.7000 gb-sisyphus-task238768.6000 gb-sisyphus-task229151.100 gb-sisyphus-task227574.200 gb-sisyphus-task226762.6000 gb-sisyphus-task219546.1700 gb-sisyphus-task213491.100 gb-sisyphus-task198806.100 gb-sisyphus-task181400.100 gb-sisyphus-task141957.100 gb-sisyphus-task135039.100 gb-sisyphus-task130102.100 gb-sisyphus-task129023.100 gb-sisyphus-task127959.100 gb-sisyphus-task118591.100 gb-p9-task277538.2600 gb-c9f2-task327704.1100 fixed-0.17.0-git200911 alt-0.17.0-git200711 alt-0.17.0-git050212 alt-0.16.2
No related merge requests found
...@@ -96,9 +96,9 @@ void parse_cmdline(int argc, char **argv, struct options *options) ...@@ -96,9 +96,9 @@ void parse_cmdline(int argc, char **argv, struct options *options)
"don't create database, even if it doesn't exist", NULL }, "don't create database, even if it doesn't exist", NULL },
{ "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon, { "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon,
"don't detach from console", NULL }, "don't detach from console", NULL },
{ "stdout", 0, 0, G_OPTION_ARG_NONE, &options->stderr, { "stdout", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
NULL, NULL }, NULL, NULL },
{ "stderr", 0, 0, G_OPTION_ARG_NONE, &options->stderr, { "stderr", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
"print messages to stderr", NULL }, "print messages to stderr", NULL },
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &options->verbose, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &options->verbose,
"verbose logging", NULL }, "verbose logging", NULL },
...@@ -109,7 +109,7 @@ void parse_cmdline(int argc, char **argv, struct options *options) ...@@ -109,7 +109,7 @@ void parse_cmdline(int argc, char **argv, struct options *options)
options->kill = false; options->kill = false;
options->daemon = true; options->daemon = true;
options->stderr = false; options->log_stderr = false;
options->verbose = false; options->verbose = false;
options->create_db = 0; options->create_db = 0;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
struct options { struct options {
gboolean kill; gboolean kill;
gboolean daemon; gboolean daemon;
gboolean stderr; gboolean log_stderr;
gboolean verbose; gboolean verbose;
int create_db; int create_db;
}; };
......
...@@ -307,7 +307,7 @@ int main(int argc, char *argv[]) ...@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
stats_global_init(); stats_global_init();
tag_lib_init(); tag_lib_init();
log_init(options.verbose, options.stderr); log_init(options.verbose, options.log_stderr);
listen_global_init(); listen_global_init();
...@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) ...@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
daemonize(options.daemon); daemonize(options.daemon);
setup_log_output(options.stderr); setup_log_output(options.log_stderr);
initSigHandlers(); initSigHandlers();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment