summaryrefslogtreecommitdiffstats
path: root/src/daemon/daemon-conf.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-18 21:38:40 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-18 21:38:40 +0000
commite385d93e5aad6a6fce754c00c804ff1d6a6746d4 (patch)
tree0abe352f3228513a912c209f62b0d3e857e62104 /src/daemon/daemon-conf.c
parent1bc62d5ec671bf3edab5263fdc8015c0a701ce81 (diff)
remove all occurences of
pa_logXXX(__FILE__": and replace them by pa_logXXX(" git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1272 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/daemon-conf.c')
-rw-r--r--src/daemon/daemon-conf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 3e585d90..2cb06697 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -168,7 +168,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'.", filename, line, rvalue);
+ pa_log("[%s:%u] Invalid log target '%s'.", filename, line, rvalue);
return -1;
}
@@ -180,7 +180,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'.", filename, line, rvalue);
+ pa_log("[%s:%u] Invalid log level '%s'.", filename, line, rvalue);
return -1;
}
@@ -192,7 +192,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'.", filename, line, rvalue);
+ pa_log("[%s:%u] Inavalid resample method '%s'.", filename, line, rvalue);
return -1;
}
@@ -214,14 +214,14 @@ static int parse_rlimit(const char *filename, unsigned line, const char *lvalue,
} else {
int32_t k;
if (pa_atoi(rvalue, &k) < 0) {
- pa_log(__FILE__": [%s:%u] Inavalid rlimit '%s'.", filename, line, rvalue);
+ pa_log("[%s:%u] Inavalid rlimit '%s'.", filename, line, rvalue);
return -1;
}
r->is_set = k >= 0;
r->value = k >= 0 ? (rlim_t) k : 0;
}
#else
- pa_log_warn(__FILE__": [%s:%u] rlimit not supported on this platform.", filename, line);
+ pa_log_warn("[%s:%u] rlimit not supported on this platform.", filename, line);
#endif
return 0;
@@ -308,7 +308,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, "r");
if (!f && errno != ENOENT) {
- pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", c->config_file, pa_cstrerror(errno));
+ pa_log("WARNING: failed to open configuration file '%s': %s", c->config_file, pa_cstrerror(errno));
goto finish;
}