summaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/pacmd.c20
-rw-r--r--src/utils/pax11publish.c2
2 files changed, 11 insertions, 11 deletions
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index fe8038e0..b9912701 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -49,12 +49,12 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
fd_set ifds, ofds;
if (pa_pid_file_check_running(&pid) < 0) {
- pa_log(__FILE__": no PulseAudio daemon running");
+ pa_log("no PulseAudio daemon running");
goto fail;
}
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(PF_UNIX, SOCK_STREAM, 0): %s", strerror(errno));
+ pa_log("socket(PF_UNIX, SOCK_STREAM, 0): %s", strerror(errno));
goto fail;
}
@@ -66,7 +66,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
int r;
if ((r = connect(fd, (struct sockaddr*) &sa, sizeof(sa))) < 0 && (errno != ECONNREFUSED && errno != ENOENT)) {
- pa_log(__FILE__": connect(): %s", strerror(errno));
+ pa_log("connect(): %s", strerror(errno));
goto fail;
}
@@ -74,7 +74,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
break;
if (pa_pid_file_kill(SIGUSR2, NULL) < 0) {
- pa_log(__FILE__": failed to kill PulseAudio daemon.");
+ pa_log("failed to kill PulseAudio daemon.");
goto fail;
}
@@ -82,7 +82,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
}
if (i >= 5) {
- pa_log(__FILE__": daemon not responding.");
+ pa_log("daemon not responding.");
goto fail;
}
@@ -97,7 +97,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
for (;;) {
if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
- pa_log(__FILE__": select(): %s", strerror(errno));
+ pa_log("select(): %s", strerror(errno));
goto fail;
}
@@ -109,7 +109,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
if (r == 0)
break;
- pa_log(__FILE__": read(): %s", strerror(errno));
+ pa_log("read(): %s", strerror(errno));
goto fail;
}
@@ -125,7 +125,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
if (r == 0)
break;
- pa_log(__FILE__": read(): %s", strerror(errno));
+ pa_log("read(): %s", strerror(errno));
goto fail;
}
@@ -138,7 +138,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
assert(obuf_length);
if ((r = write(1, obuf + obuf_index, obuf_length)) < 0) {
- pa_log(__FILE__": write(): %s", strerror(errno));
+ pa_log("write(): %s", strerror(errno));
goto fail;
}
@@ -152,7 +152,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
assert(ibuf_length);
if ((r = write(fd, ibuf + ibuf_index, ibuf_length)) < 0) {
- pa_log(__FILE__": write(): %s", strerror(errno));
+ pa_log("write(): %s", strerror(errno));
goto fail;
}
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 2a0d21d6..6a3c6dbc 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
}
if (!(d = XOpenDisplay(dname))) {
- pa_log(__FILE__": XOpenDisplay() failed");
+ pa_log("XOpenDisplay() failed");
goto finish;
}