From 4a64b0d1167e980d81b798d813f35209895f0674 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Feb 2006 02:27:19 +0000 Subject: change pa_log() and friends to not require a trailing \n on all logged strings git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/polyp/browser.c | 10 +++++----- src/polyp/client-conf-x11.c | 4 ++-- src/polyp/client-conf.c | 2 +- src/polyp/context.c | 12 ++++++------ src/polyp/mainloop-signal.c | 10 +++++----- src/polyp/mainloop.c | 14 +++++++------- src/polyp/stream.c | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/polyp') diff --git a/src/polyp/browser.c b/src/polyp/browser.c index ce4c0103..de5c751a 100644 --- a/src/polyp/browser.c +++ b/src/polyp/browser.c @@ -48,7 +48,7 @@ static void io_callback(pa_mainloop_api*a, pa_io_event*e, int fd, pa_io_event_fl assert(a && b && b->mainloop == a); if (events != PA_IO_EVENT_INPUT || sw_discovery_read_socket(b->discovery) != SW_OKAY) { - pa_log(__FILE__": connection to HOWL daemon failed.\n"); + pa_log(__FILE__": connection to HOWL daemon failed."); b->mainloop->io_free(b->io_event); b->io_event = NULL; return; @@ -131,7 +131,7 @@ static sw_result resolve_reply( uint32_t val_len; if (sw_text_record_iterator_init(&iterator, text_record, text_record_len) != SW_OKAY) { - pa_log("sw_text_record_string_iterator_init() failed.\n"); + pa_log_error(__FILE__": sw_text_record_string_iterator_init() failed."); goto fail; } @@ -244,7 +244,7 @@ static sw_result browse_reply( sw_discovery_oid oid; if (sw_discovery_resolve(b->discovery, 0, name, type, domain, resolve_reply, b, &oid) != SW_OKAY) - pa_log("sw_discovery_resolve() failed\n"); + pa_log_error(__FILE__": sw_discovery_resolve() failed"); break; } @@ -282,7 +282,7 @@ pa_browser *pa_browser_new(pa_mainloop_api *mainloop) { b->userdata = NULL; if (sw_discovery_init(&b->discovery) != SW_OKAY) { - pa_log("sw_discovery_init() failed.\n"); + pa_log_error(__FILE__": sw_discovery_init() failed."); pa_xfree(b); return NULL; } @@ -291,7 +291,7 @@ pa_browser *pa_browser_new(pa_mainloop_api *mainloop) { sw_discovery_browse(b->discovery, 0, SERVICE_NAME_SINK, NULL, browse_reply, b, &oid) != SW_OKAY || sw_discovery_browse(b->discovery, 0, SERVICE_NAME_SOURCE, NULL, browse_reply, b, &oid) != SW_OKAY) { - pa_log("sw_discovery_browse() failed.\n"); + pa_log_error(__FILE__": sw_discovery_browse() failed."); sw_discovery_fina(b->discovery); pa_xfree(b); diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c index 9e863bc7..7187d86b 100644 --- a/src/polyp/client-conf-x11.c +++ b/src/polyp/client-conf-x11.c @@ -45,7 +45,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\n"); + pa_log(__FILE__": XOpenDisplay() failed"); goto finish; } @@ -68,7 +68,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\n"); + pa_log(__FILE__": failed to parse cookie data"); goto finish; } diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c index 328d01c9..4202b14c 100644 --- a/src/polyp/client-conf.c +++ b/src/polyp/client-conf.c @@ -122,7 +122,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); if (!f && errno != EINTR) { - pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s\n", filename, strerror(errno)); + pa_log(__FILE__": WARNING: failed to open configuration file '%s': %s", filename, strerror(errno)); goto finish; } diff --git a/src/polyp/context.c b/src/polyp/context.c index 906a0d89..8e999225 100644 --- a/src/polyp/context.c +++ b/src/polyp/context.c @@ -424,7 +424,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() failed: %s\n", strerror(errno)); + pa_log(__FILE__": socketpair() failed: %s", strerror(errno)); pa_context_fail(c, PA_ERR_INTERNAL); goto fail; } @@ -438,7 +438,7 @@ static int context_connect_spawn(pa_context *c) { c->spawn_api.prefork(); if ((pid = fork()) < 0) { - pa_log(__FILE__": fork() failed: %s\n", strerror(errno)); + pa_log(__FILE__": fork() failed: %s", strerror(errno)); pa_context_fail(c, PA_ERR_INTERNAL); if (c->spawn_api.postfork) @@ -494,7 +494,7 @@ static int context_connect_spawn(pa_context *c) { c->spawn_api.postfork(); if (r < 0) { - pa_log(__FILE__": waitpid() failed: %s\n", strerror(errno)); + pa_log(__FILE__": waitpid() failed: %s", strerror(errno)); pa_context_fail(c, PA_ERR_INTERNAL); goto fail; } else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { @@ -556,7 +556,7 @@ static int try_next_connection(pa_context *c) { goto finish; } - pa_log_debug(__FILE__": Trying to connect to %s...\n", u); + pa_log_debug(__FILE__": Trying to connect to %s...", u); pa_xfree(c->server); c->server = pa_xstrdup(u); @@ -714,8 +714,8 @@ int pa_context_is_pending(pa_context *c) { assert(c); assert(c->ref >= 1); -/* pa_log("pstream: %i\n", pa_pstream_is_pending(c->pstream)); */ -/* pa_log("pdispatch: %i\n", pa_pdispatch_is_pending(c->pdispatch)); */ +/* pa_log("pstream: %i", pa_pstream_is_pending(c->pstream)); */ +/* pa_log("pdispatch: %i", pa_pdispatch_is_pending(c->pdispatch)); */ return (c->pstream && pa_pstream_is_pending(c->pstream)) || (c->pdispatch && pa_pdispatch_is_pending(c->pdispatch)) || diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c index 00804324..0b33c44b 100644 --- a/src/polyp/mainloop-signal.c +++ b/src/polyp/mainloop-signal.c @@ -104,12 +104,12 @@ static void defer(pa_mainloop_api*a, PA_GCC_UNUSED pa_defer_event*e, PA_GCC_UNUS while (sigs) { if ((r = read(signal_pipe[0], &sig, sizeof(sig))) < 0) { - pa_log(__FILE__": read(): %s\n", strerror(errno)); + pa_log(__FILE__": read(): %s", strerror(errno)); return; } if (r != sizeof(sig)) { - pa_log(__FILE__": short read()\n"); + pa_log(__FILE__": short read()"); return; } @@ -130,12 +130,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\n", strerror(errno)); + pa_log(__FILE__": read(): %s", strerror(errno)); return; } if (r != sizeof(sig)) { - pa_log(__FILE__": short read()\n"); + pa_log(__FILE__": short read()"); return; } @@ -150,7 +150,7 @@ int pa_signal_init(pa_mainloop_api *a) { #else if (pipe(signal_pipe) < 0) { #endif - pa_log(__FILE__": pipe() failed: %s\n", strerror(errno)); + pa_log(__FILE__": pipe() failed: %s", strerror(errno)); return -1; } diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c index e975d7d7..95c336e4 100644 --- a/src/polyp/mainloop.c +++ b/src/polyp/mainloop.c @@ -145,7 +145,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.\n"); + pa_log_warn(__FILE__": WARNING: cannot monitor non-socket file descriptors."); e->dead = 1; } } @@ -725,7 +725,7 @@ int pa_mainloop_iterate(pa_mainloop *m, int block, int *retval) { r = pa_mainloop_poll(m); if (r < 0) { - pa_log(__FILE__": poll(): %s\n", strerror(errno)); + pa_log(__FILE__": poll(): %s", strerror(errno)); return r; } @@ -774,7 +774,7 @@ int pa_mainloop_deferred_pending(pa_mainloop *m) { void pa_mainloop_dump(pa_mainloop *m) { assert(m); - pa_log(__FILE__": Dumping mainloop sources START\n"); + pa_log(__FILE__": Dumping mainloop sources START"); { uint32_t idx = PA_IDXSET_INVALID; @@ -783,7 +783,7 @@ void pa_mainloop_dump(pa_mainloop *m) { if (e->dead) continue; - pa_log(__FILE__": kind=io fd=%i events=%i callback=%p userdata=%p\n", e->fd, (int) e->events, (void*) e->callback, (void*) e->userdata); + pa_log(__FILE__": kind=io fd=%i events=%i callback=%p userdata=%p", e->fd, (int) e->events, (void*) e->callback, (void*) e->userdata); } } { @@ -793,7 +793,7 @@ void pa_mainloop_dump(pa_mainloop *m) { if (e->dead) continue; - pa_log(__FILE__": kind=defer enabled=%i callback=%p userdata=%p\n", e->enabled, (void*) e->callback, (void*) e->userdata); + pa_log(__FILE__": kind=defer enabled=%i callback=%p userdata=%p", e->enabled, (void*) e->callback, (void*) e->userdata); } } { @@ -803,11 +803,11 @@ void pa_mainloop_dump(pa_mainloop *m) { if (e->dead) continue; - pa_log(__FILE__": kind=time enabled=%i time=%lu.%lu callback=%p userdata=%p\n", e->enabled, (unsigned long) e->timeval.tv_sec, (unsigned long) e->timeval.tv_usec, (void*) e->callback, (void*) e->userdata); + pa_log(__FILE__": kind=time enabled=%i time=%lu.%lu callback=%p userdata=%p", e->enabled, (unsigned long) e->timeval.tv_sec, (unsigned long) e->timeval.tv_usec, (void*) e->callback, (void*) e->userdata); } } - pa_log(__FILE__": Dumping mainloop sources STOP\n"); + pa_log(__FILE__": Dumping mainloop sources STOP"); } #endif diff --git a/src/polyp/stream.c b/src/polyp/stream.c index 5ab91815..8bdb9059 100644 --- a/src/polyp/stream.c +++ b/src/polyp/stream.c @@ -289,7 +289,7 @@ static void ipol_callback(pa_mainloop_api *m, pa_time_event *e, PA_GCC_UNUSED co pa_stream_ref(s); -/* pa_log("requesting new ipol data\n"); */ +/* pa_log("requesting new ipol data"); */ if (s->state == PA_STREAM_READY && !s->ipol_requested) { pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); @@ -655,7 +655,7 @@ static void stream_get_latency_info_callback(pa_pdispatch *pd, uint32_t command, } if (o->stream->interpolate) { -/* pa_log("new interpol data\n"); */ +/* pa_log("new interpol data"); */ o->stream->ipol_timestamp = i.timestamp; o->stream->ipol_usec = pa_stream_get_time(o->stream, &i); o->stream->ipol_requested = 0; -- cgit