mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

drop a couple of WARNING prefixes in log messages, since we have pa_log_warn anyway for marking warnings especially

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1842 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-17 14:03:04 +00:00
parent 19eb7ebd4d
commit d3b898513c
13 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/daemon-conf.c
View file

@ -426,7 +426,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"); pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file, "r");
if (!f && errno != ENOENT) { 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; goto finish;
} }

2
src/modules/module-combine.c
View file

@ -1051,7 +1051,7 @@ int pa__init(pa_module*m) {
} }
if (pa_idxset_size(u->outputs) <= 1) 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; u->sink_new_slot = NULL;

2
src/modules/module-esound-compat-spawnfd.c
View file

@ -63,7 +63,7 @@ int pa__init(pa_module*m) {
} }
if (pa_loop_write(fd, &x, sizeof(x), NULL) != sizeof(x)) 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); pa_assert_se(pa_close(fd) == 0);

2
src/modules/module-esound-compat-spawnpid.c
View file

@ -62,7 +62,7 @@ int pa__init(pa_module*m) {
} }
if (kill(pid, SIGUSR1) < 0) 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); pa_module_unload_request(m);

2
src/modules/module-esound-sink.c
View file

@ -210,7 +210,7 @@ static int handle_response(struct userdata *u) {
/* Process latency info */ /* Process latency info */
u->latency = (pa_usec_t) ((double) (*(int32_t*) u->read_data) * 1000000 / 44100); u->latency = (pa_usec_t) ((double) (*(int32_t*) u->read_data) * 1000000 / 44100);
if (u->latency > 10000000) { 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; u->latency = 0;
} }

2
src/pulse/client-conf.c
View file

@ -117,7 +117,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"); pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn, "r");
if (!f && errno != EINTR) { 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; goto finish;
} }

2
src/pulse/mainloop.c
View file

@ -194,7 +194,7 @@ static pa_io_event* mainloop_io_new(
if ((select((SELECT_TYPE_ARG1) fd, NULL, NULL, SELECT_TYPE_ARG234 &xset, if ((select((SELECT_TYPE_ARG1) fd, NULL, NULL, SELECT_TYPE_ARG234 &xset,
SELECT_TYPE_ARG5 &tv) == -1) && SELECT_TYPE_ARG5 &tv) == -1) &&
(WSAGetLastError() == WSAENOTSOCK)) { (WSAGetLastError() == WSAENOTSOCK)) {
pa_log_warn("WARNING: cannot monitor non-socket file descriptors."); pa_log_warn("Cannot monitor non-socket file descriptors.");
e->dead = 1; e->dead = 1;
} }
} }

4
src/pulsecore/conf-parser.c
View file

@ -120,7 +120,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void
goto finish; 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)); filename, pa_cstrerror(errno));
goto finish; goto finish;
} }
@ -131,7 +131,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void
if (feof(f)) if (feof(f))
break; 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)); filename, pa_cstrerror(errno));
goto finish; goto finish;
} }

14
src/pulsecore/core-util.c
View file

@ -141,10 +141,10 @@ void pa_make_nonblock_fd(int fd) {
u_long arg = 1; u_long arg = 1;
if (ioctlsocket(fd, FIONBIO, &arg) < 0) { if (ioctlsocket(fd, FIONBIO, &arg) < 0) {
if (WSAGetLastError() == WSAENOTSOCK) 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 #else
pa_log_warn("WARNING: Non-blocking I/O not supported.!"); pa_log_warn("Non-blocking I/O not supported.!");
#endif #endif
} }
@ -411,9 +411,9 @@ void pa_check_signal_is_blocked(int sig) {
if (sa.sa_handler != SIG_DFL) if (sa.sa_handler != SIG_DFL)
return; 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 */ #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 #endif
} }
@ -995,10 +995,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
return f; return f;
} }
if (errno != ENOENT) { if (errno != ENOENT)
pa_log_warn("WARNING: failed to open configuration file '%s': %s", pa_log_warn("Failed to open configuration file '%s': %s", lfn, pa_cstrerror(errno));
lfn, pa_cstrerror(errno));
}
pa_xfree(lfn); pa_xfree(lfn);
} }

4
src/pulsecore/flist.c
View file

@ -186,7 +186,7 @@ int pa_flist_push(pa_flist*l, void *p) {
#ifdef PROFILE #ifdef PROFILE
if (len > N_EXTRA_SCAN) 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 #endif
return -1; return -1;
@ -227,7 +227,7 @@ void* pa_flist_pop(pa_flist*l) {
#ifdef PROFILE #ifdef PROFILE
if (len > N_EXTRA_SCAN) 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 #endif
return NULL; return NULL;

4
src/pulsecore/ipacl.c
View file

@ -109,7 +109,7 @@ pa_ip_acl* pa_ip_acl_new(const char *s) {
e.family = AF_INET; e.family = AF_INET;
if (e.bits < 32 && (uint32_t) (ntohl(e.address_ipv4.s_addr) << e.bits) != 0) 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) { } else if (inet_pton(AF_INET6, a, &e.address_ipv6) > 0) {
@ -138,7 +138,7 @@ pa_ip_acl* pa_ip_acl_new(const char *s) {
} }
if (t) 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 { } else {

2
src/pulsecore/memblock.c
View file

@ -704,7 +704,7 @@ void pa_mempool_free(pa_mempool *p) {
if (pa_atomic_load(&p->stat.n_allocated) > 0) { if (pa_atomic_load(&p->stat.n_allocated) > 0) {
/* raise(SIGTRAP); */ /* 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); pa_shm_free(&p->memory);

4
src/pulsecore/pid.c
View file

@ -90,7 +90,7 @@ static int open_pid_file(const char *fn, int mode) {
if ((fd = open(fn, mode, S_IRUSR|S_IWUSR)) < 0) { if ((fd = open(fn, mode, S_IRUSR|S_IWUSR)) < 0) {
if (mode != O_RDONLY || errno != ENOENT) 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; goto fail;
} }
@ -204,7 +204,7 @@ int pa_pid_file_remove(void) {
pa_runtime_path("pid", fn, sizeof(fn)); pa_runtime_path("pid", fn, sizeof(fn));
if ((fd = open_pid_file(fn, O_RDWR)) < 0) { 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)); fn, pa_cstrerror(errno));
goto fail; goto fail;
} }