[pulseaudio-commits] r1842 - in /branches/lennart/src: daemon/ modules/ pulse/ pulsecore/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Mon Sep 17 07:03:05 PDT 2007
Author: lennart
Date: Mon Sep 17 16:03:04 2007
New Revision: 1842
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1842&root=pulseaudio&view=rev
Log:
drop a couple of WARNING prefixes in log messages, since we have pa_log_warn anyway for marking warnings especially
Modified:
branches/lennart/src/daemon/daemon-conf.c
branches/lennart/src/modules/module-combine.c
branches/lennart/src/modules/module-esound-compat-spawnfd.c
branches/lennart/src/modules/module-esound-compat-spawnpid.c
branches/lennart/src/modules/module-esound-sink.c
branches/lennart/src/pulse/client-conf.c
branches/lennart/src/pulse/mainloop.c
branches/lennart/src/pulsecore/conf-parser.c
branches/lennart/src/pulsecore/core-util.c
branches/lennart/src/pulsecore/flist.c
branches/lennart/src/pulsecore/ipacl.c
branches/lennart/src/pulsecore/memblock.c
branches/lennart/src/pulsecore/pid.c
Modified: branches/lennart/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/daemon-conf.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/daemon/daemon-conf.c (original)
+++ branches/lennart/src/daemon/daemon-conf.c Mon Sep 17 16:03:04 2007
@@ -426,7 +426,7 @@
pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file, "r");
if (!f && errno != ENOENT) {
- pa_log("WARNING: failed to open configuration file '%s': %s", c->config_file, pa_cstrerror(errno));
+ pa_log_warn("Failed to open configuration file '%s': %s", c->config_file, pa_cstrerror(errno));
goto finish;
}
Modified: branches/lennart/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/module-combine.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/modules/module-combine.c (original)
+++ branches/lennart/src/modules/module-combine.c Mon Sep 17 16:03:04 2007
@@ -1051,7 +1051,7 @@
}
if (pa_idxset_size(u->outputs) <= 1)
- pa_log_warn("WARNING: No slave sinks specified.");
+ pa_log_warn("No slave sinks specified.");
u->sink_new_slot = NULL;
Modified: branches/lennart/src/modules/module-esound-compat-spawnfd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/module-esound-compat-spawnfd.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/modules/module-esound-compat-spawnfd.c (original)
+++ branches/lennart/src/modules/module-esound-compat-spawnfd.c Mon Sep 17 16:03:04 2007
@@ -63,7 +63,7 @@
}
if (pa_loop_write(fd, &x, sizeof(x), NULL) != sizeof(x))
- pa_log_warn("WARNING: write(%u, 1, 1) failed: %s", fd, pa_cstrerror(errno));
+ pa_log_warn("write(%u, 1, 1) failed: %s", fd, pa_cstrerror(errno));
pa_assert_se(pa_close(fd) == 0);
Modified: branches/lennart/src/modules/module-esound-compat-spawnpid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/module-esound-compat-spawnpid.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/modules/module-esound-compat-spawnpid.c (original)
+++ branches/lennart/src/modules/module-esound-compat-spawnpid.c Mon Sep 17 16:03:04 2007
@@ -62,7 +62,7 @@
}
if (kill(pid, SIGUSR1) < 0)
- pa_log_warn("WARNING: kill(%u) failed: %s", pid, pa_cstrerror(errno));
+ pa_log_warn("kill(%u) failed: %s", pid, pa_cstrerror(errno));
pa_module_unload_request(m);
Modified: branches/lennart/src/modules/module-esound-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/module-esound-sink.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/modules/module-esound-sink.c (original)
+++ branches/lennart/src/modules/module-esound-sink.c Mon Sep 17 16:03:04 2007
@@ -210,7 +210,7 @@
/* Process latency info */
u->latency = (pa_usec_t) ((double) (*(int32_t*) u->read_data) * 1000000 / 44100);
if (u->latency > 10000000) {
- pa_log("WARNING! Invalid latency information received from server");
+ pa_log_warn("Invalid latency information received from server");
u->latency = 0;
}
Modified: branches/lennart/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulse/client-conf.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulse/client-conf.c (original)
+++ branches/lennart/src/pulse/client-conf.c Mon Sep 17 16:03:04 2007
@@ -117,7 +117,7 @@
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_warn("WARNING: failed to open configuration file '%s': %s", fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to open configuration file '%s': %s", fn, pa_cstrerror(errno));
goto finish;
}
Modified: branches/lennart/src/pulse/mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulse/mainloop.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulse/mainloop.c (original)
+++ branches/lennart/src/pulse/mainloop.c Mon Sep 17 16:03:04 2007
@@ -194,7 +194,7 @@
if ((select((SELECT_TYPE_ARG1) fd, NULL, NULL, SELECT_TYPE_ARG234 &xset,
SELECT_TYPE_ARG5 &tv) == -1) &&
(WSAGetLastError() == WSAENOTSOCK)) {
- pa_log_warn("WARNING: cannot monitor non-socket file descriptors.");
+ pa_log_warn("Cannot monitor non-socket file descriptors.");
e->dead = 1;
}
}
Modified: branches/lennart/src/pulsecore/conf-parser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/conf-parser.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/conf-parser.c (original)
+++ branches/lennart/src/pulsecore/conf-parser.c Mon Sep 17 16:03:04 2007
@@ -120,7 +120,7 @@
goto finish;
}
- pa_log_warn("WARNING: failed to open configuration file '%s': %s",
+ pa_log_warn("Failed to open configuration file '%s': %s",
filename, pa_cstrerror(errno));
goto finish;
}
@@ -131,7 +131,7 @@
if (feof(f))
break;
- pa_log_warn("WARNING: failed to read configuration file '%s': %s",
+ pa_log_warn("Failed to read configuration file '%s': %s",
filename, pa_cstrerror(errno));
goto finish;
}
Modified: branches/lennart/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/core-util.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/core-util.c (original)
+++ branches/lennart/src/pulsecore/core-util.c Mon Sep 17 16:03:04 2007
@@ -141,10 +141,10 @@
u_long arg = 1;
if (ioctlsocket(fd, FIONBIO, &arg) < 0) {
if (WSAGetLastError() == WSAENOTSOCK)
- pa_log_warn("WARNING: Only sockets can be made non-blocking!");
+ pa_log_warn("Only sockets can be made non-blocking!");
}
#else
- pa_log_warn("WARNING: Non-blocking I/O not supported.!");
+ pa_log_warn("Non-blocking I/O not supported.!");
#endif
}
@@ -411,9 +411,9 @@
if (sa.sa_handler != SIG_DFL)
return;
- pa_log("WARNING: %s is not trapped. This might cause malfunction!", pa_strsignal(sig));
+ pa_log_warn("%s is not trapped. This might cause malfunction!", pa_strsignal(sig));
#else /* HAVE_SIGACTION */
- pa_log("WARNING: %s might not be trapped. This might cause malfunction!", pa_strsignal(sig));
+ pa_log_warn("%s might not be trapped. This might cause malfunction!", pa_strsignal(sig));
#endif
}
@@ -995,10 +995,8 @@
return f;
}
- if (errno != ENOENT) {
- pa_log_warn("WARNING: failed to open configuration file '%s': %s",
- lfn, pa_cstrerror(errno));
- }
+ if (errno != ENOENT)
+ pa_log_warn("Failed to open configuration file '%s': %s", lfn, pa_cstrerror(errno));
pa_xfree(lfn);
}
Modified: branches/lennart/src/pulsecore/flist.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/flist.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/flist.c (original)
+++ branches/lennart/src/pulsecore/flist.c Mon Sep 17 16:03:04 2007
@@ -186,7 +186,7 @@
#ifdef PROFILE
if (len > N_EXTRA_SCAN)
- pa_log("WARNING: Didn't find free cell after %u iterations.", len);
+ pa_log_warn("Didn't find free cell after %u iterations.", len);
#endif
return -1;
@@ -227,7 +227,7 @@
#ifdef PROFILE
if (len > N_EXTRA_SCAN)
- pa_log("WARNING: Didn't find used cell after %u iterations.", len);
+ pa_log_warn("Didn't find used cell after %u iterations.", len);
#endif
return NULL;
Modified: branches/lennart/src/pulsecore/ipacl.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/ipacl.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/ipacl.c (original)
+++ branches/lennart/src/pulsecore/ipacl.c Mon Sep 17 16:03:04 2007
@@ -109,7 +109,7 @@
e.family = AF_INET;
if (e.bits < 32 && (uint32_t) (ntohl(e.address_ipv4.s_addr) << e.bits) != 0)
- pa_log_warn("WARNING: Host part of ACL entry '%s/%u' is not zero!", a, e.bits);
+ pa_log_warn("Host part of ACL entry '%s/%u' is not zero!", a, e.bits);
} else if (inet_pton(AF_INET6, a, &e.address_ipv6) > 0) {
@@ -138,7 +138,7 @@
}
if (t)
- pa_log_warn("WARNING: Host part of ACL entry '%s/%u' is not zero!", a, e.bits);
+ pa_log_warn("Host part of ACL entry '%s/%u' is not zero!", a, e.bits);
}
} else {
Modified: branches/lennart/src/pulsecore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/memblock.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/memblock.c (original)
+++ branches/lennart/src/pulsecore/memblock.c Mon Sep 17 16:03:04 2007
@@ -704,7 +704,7 @@
if (pa_atomic_load(&p->stat.n_allocated) > 0) {
/* raise(SIGTRAP); */
- pa_log_warn("WARNING! Memory pool destroyed but not all memory blocks freed! %u remain.", pa_atomic_load(&p->stat.n_allocated));
+ pa_log_warn("Memory pool destroyed but not all memory blocks freed! %u remain.", pa_atomic_load(&p->stat.n_allocated));
}
pa_shm_free(&p->memory);
Modified: branches/lennart/src/pulsecore/pid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/pid.c?rev=1842&root=pulseaudio&r1=1841&r2=1842&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/pid.c (original)
+++ branches/lennart/src/pulsecore/pid.c Mon Sep 17 16:03:04 2007
@@ -90,7 +90,7 @@
if ((fd = open(fn, mode, S_IRUSR|S_IWUSR)) < 0) {
if (mode != O_RDONLY || errno != ENOENT)
- pa_log_warn("WARNING: failed to open PID file '%s': %s", fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to open PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
@@ -204,7 +204,7 @@
pa_runtime_path("pid", fn, sizeof(fn));
if ((fd = open_pid_file(fn, O_RDWR)) < 0) {
- pa_log_warn("WARNING: failed to open PID file '%s': %s",
+ pa_log_warn("Failed to open PID file '%s': %s",
fn, pa_cstrerror(errno));
goto fail;
}
More information about the pulseaudio-commits
mailing list