aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-28 19:48:53 +0100
committerMax Kellermann <max@duempel.org>2008-12-28 19:48:53 +0100
commitd70c2e228517c60506a98b38d90cc3e939b6331c (patch)
treeafa7e66f2f9de110ebaa2d1c5229787187e3a8e2
parentcaf47f7893a666a9ea289f2ffdbce528d4ba75bd (diff)
downloadmpd-d70c2e228517c60506a98b38d90cc3e939b6331c.tar.gz
mpd-d70c2e228517c60506a98b38d90cc3e939b6331c.tar.xz
mpd-d70c2e228517c60506a98b38d90cc3e939b6331c.zip
log: merged initLog() and open_log_files().
The logging library currently has 3 constructor functions: initLog(), open_log_files(), setup_log_output(), called in this order. Merged the first two.
-rw-r--r--src/log.c7
-rw-r--r--src/log.h4
-rw-r--r--src/main.c4
3 files changed, 3 insertions, 12 deletions
diff --git a/src/log.c b/src/log.c
index b3f8410ee..38e0a8f10 100644
--- a/src/log.c
+++ b/src/log.c
@@ -115,7 +115,7 @@ parse_log_level(const char *value, unsigned line)
value, line);
}
-void initLog(bool verbose)
+void log_init(bool verbose, bool use_stdout)
{
ConfigParam *param;
@@ -127,11 +127,6 @@ void initLog(bool verbose)
log_threshold = G_LOG_LEVEL_DEBUG;
else if ((param = getConfigParam(CONF_LOG_LEVEL)) != NULL)
log_threshold = parse_log_level(param->value, param->line);
-}
-
-void open_log_files(bool use_stdout)
-{
- ConfigParam *param;
if (use_stdout)
return;
diff --git a/src/log.h b/src/log.h
index 68ae995aa..462baa066 100644
--- a/src/log.h
+++ b/src/log.h
@@ -29,12 +29,10 @@ G_GNUC_PRINTF(1, 2) void DEBUG(const char *fmt, ...);
G_GNUC_PRINTF(1, 2) void WARNING(const char *fmt, ...);
G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN void FATAL(const char *fmt, ...);
-void initLog(bool verbose);
+void log_init(bool verbose, bool use_stdout);
void setup_log_output(bool use_stdout);
-void open_log_files(bool use_stdout);
-
int cycle_log_files(void);
void close_log_files(void);
diff --git a/src/main.c b/src/main.c
index 564241577..b64a07f22 100644
--- a/src/main.c
+++ b/src/main.c
@@ -277,15 +277,13 @@ int main(int argc, char *argv[])
initStats();
tag_lib_init();
- initLog(options.verbose);
+ log_init(options.verbose, options.stdOutput);
if (options.createDB <= 0)
listenOnPort();
changeToUser();
- open_log_files(options.stdOutput);
-
path_global_init();
mapper_init();
initPermissions();