summaryrefslogtreecommitdiffstats
path: root/src/daemon/daemon-conf.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-02-23 02:27:19 +0000
committerLennart Poettering <lennart@poettering.net>2006-02-23 02:27:19 +0000
commit4a64b0d1167e980d81b798d813f35209895f0674 (patch)
tree52688c3035eadaea2970cb3d07c64b0676c154b8 /src/daemon/daemon-conf.c
parentcb59817b4a2e1f640bd9279d0c7863e7a09c1fa6 (diff)
change pa_log() and friends to not require a trailing \n on all logged strings
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/daemon-conf.c')
-rw-r--r--src/daemon/daemon-conf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index ecabce40..ac5fbb16 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -160,7 +160,7 @@ static int parse_log_target(const char *filename, unsigned line, const char *lva
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_target(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Invalid log target '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Invalid log target '%s'.", filename, line, rvalue);
return -1;
}
@@ -172,7 +172,7 @@ static int parse_log_level(const char *filename, unsigned line, const char *lval
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_level(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Invalid log level '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Invalid log level '%s'.", filename, line, rvalue);
return -1;
}
@@ -184,7 +184,7 @@ static int parse_resample_method(const char *filename, unsigned line, const char
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_resample_method(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.", filename, line, rvalue);
return -1;
}
@@ -236,7 +236,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file);
if (!f && errno != ENOENT) {
- pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s\n", filename, strerror(errno));
+ pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, strerror(errno));
goto finish;
}