summaryrefslogtreecommitdiffstats
path: root/src/pulse
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/pulse
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/pulse')
-rw-r--r--src/pulse/client-conf-x11.c4
-rw-r--r--src/pulse/client-conf.c2
-rw-r--r--src/pulse/context.c8
-rw-r--r--src/pulse/mainloop-signal.c6
-rw-r--r--src/pulse/mainloop.c6
-rw-r--r--src/pulse/thread-mainloop.c2
-rw-r--r--src/pulse/util.c6
7 files changed, 17 insertions, 17 deletions
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index e4a90017..8cedc48b 100644
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -46,7 +46,7 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
goto finish;
if (!(d = XOpenDisplay(dname))) {
- pa_log(__FILE__": XOpenDisplay() failed");
+ pa_log("XOpenDisplay() failed");
goto finish;
}
@@ -69,7 +69,7 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {
- pa_log(__FILE__": failed to parse cookie data");
+ pa_log("failed to parse cookie data");
goto finish;
}
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index c3f58ec2..619b11c3 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -116,7 +116,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn, "r");
if (!f && errno != EINTR) {
- pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", fn, pa_cstrerror(errno));
+ pa_log("WARNING: failed to open configuration file '%s': %s", fn, pa_cstrerror(errno));
goto finish;
}
diff --git a/src/pulse/context.c b/src/pulse/context.c
index b3530542..df627ee6 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -462,7 +462,7 @@ static int context_connect_spawn(pa_context *c) {
pa_context_ref(c);
if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
- pa_log(__FILE__": socketpair(): %s", pa_cstrerror(errno));
+ pa_log("socketpair(): %s", pa_cstrerror(errno));
pa_context_fail(c, PA_ERR_INTERNAL);
goto fail;
}
@@ -476,7 +476,7 @@ static int context_connect_spawn(pa_context *c) {
c->spawn_api.prefork();
if ((pid = fork()) < 0) {
- pa_log(__FILE__": fork(): %s", pa_cstrerror(errno));
+ pa_log("fork(): %s", pa_cstrerror(errno));
pa_context_fail(c, PA_ERR_INTERNAL);
if (c->spawn_api.postfork)
@@ -532,7 +532,7 @@ static int context_connect_spawn(pa_context *c) {
c->spawn_api.postfork();
if (r < 0) {
- pa_log(__FILE__": waitpid(): %s", pa_cstrerror(errno));
+ pa_log("waitpid(): %s", pa_cstrerror(errno));
pa_context_fail(c, PA_ERR_INTERNAL);
goto fail;
} else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
@@ -594,7 +594,7 @@ static int try_next_connection(pa_context *c) {
goto finish;
}
- pa_log_debug(__FILE__": Trying to connect to %s...", u);
+ pa_log_debug("Trying to connect to %s...", u);
pa_xfree(c->server);
c->server = pa_xstrdup(u);
diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index 11a27cd5..d651462b 100644
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -90,12 +90,12 @@ static void callback(pa_mainloop_api*a, pa_io_event*e, int fd, pa_io_event_flags
if (errno == EAGAIN)
return;
- pa_log(__FILE__": read(): %s", pa_cstrerror(errno));
+ pa_log("read(): %s", pa_cstrerror(errno));
return;
}
if (r != sizeof(sig)) {
- pa_log(__FILE__": short read()");
+ pa_log("short read()");
return;
}
@@ -107,7 +107,7 @@ int pa_signal_init(pa_mainloop_api *a) {
assert(!api && a && signal_pipe[0] == -1 && signal_pipe[1] == -1 && !io_event);
if (pipe(signal_pipe) < 0) {
- pa_log(__FILE__": pipe(): %s", pa_cstrerror(errno));
+ pa_log("pipe(): %s", pa_cstrerror(errno));
return -1;
}
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 5ebb9bc8..f7b15537 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -192,7 +192,7 @@ static pa_io_event* mainloop_io_new(
if ((select((SELECT_TYPE_ARG1) fd, NULL, NULL, SELECT_TYPE_ARG234 &xset,
SELECT_TYPE_ARG5 &tv) == -1) &&
(WSAGetLastError() == WSAENOTSOCK)) {
- pa_log_warn(__FILE__": WARNING: cannot monitor non-socket file descriptors.");
+ pa_log_warn("WARNING: cannot monitor non-socket file descriptors.");
e->dead = 1;
}
}
@@ -448,7 +448,7 @@ pa_mainloop *pa_mainloop_new(void) {
m->wakeup_pipe_type = 0;
if (pipe(m->wakeup_pipe) < 0) {
- pa_log_error(__FILE__": ERROR: cannot create wakeup pipe");
+ pa_log_error("ERROR: cannot create wakeup pipe");
pa_xfree(m);
return NULL;
}
@@ -852,7 +852,7 @@ int pa_mainloop_poll(pa_mainloop *m) {
if (errno == EINTR)
m->poll_func_ret = 0;
else
- pa_log(__FILE__": poll(): %s", pa_cstrerror(errno));
+ pa_log("poll(): %s", pa_cstrerror(errno));
}
}
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 34f0f250..b1b180a0 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -421,7 +421,7 @@ pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m) {
#else /* defined(OS_IS_WIN32) || defined(HAVE_PTHREAD) */
pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
- pa_log_error(__FILE__": Threaded main loop not supported on this platform");
+ pa_log_error("Threaded main loop not supported on this platform");
return NULL;
}
diff --git a/src/pulse/util.c b/src/pulse/util.c
index b041fec8..c13951da 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -112,7 +112,7 @@ char *pa_get_user_name(char *s, size_t l) {
char *pa_get_host_name(char *s, size_t l) {
assert(s && l > 0);
if (gethostname(s, l) < 0) {
- pa_log(__FILE__": gethostname(): %s", pa_cstrerror(errno));
+ pa_log("gethostname(): %s", pa_cstrerror(errno));
return NULL;
}
s[l-1] = 0;
@@ -138,12 +138,12 @@ char *pa_get_home_dir(char *s, size_t l) {
#ifdef HAVE_PWD_H
#ifdef HAVE_GETPWUID_R
if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
- pa_log(__FILE__": getpwuid_r() failed");
+ pa_log("getpwuid_r() failed");
#else
/* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
* that do not support getpwuid_r. */
if ((r = getpwuid(getuid())) == NULL) {
- pa_log(__FILE__": getpwuid_r() failed");
+ pa_log("getpwuid_r() failed");
#endif
return NULL;
}