[polypaudio-commits] r574 - in /trunk/src: daemon/ modules/ polyp/ polypcore/ utils/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Wed Feb 22 18:27:23 PST 2006
Author: lennart
Date: Thu Feb 23 03:27:19 2006
New Revision: 574
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=574&root=polypaudio&view=rev
Log:
change pa_log() and friends to not require a trailing \n on all logged strings
Modified:
trunk/src/daemon/caps.c
trunk/src/daemon/cmdline.c
trunk/src/daemon/cpulimit.c
trunk/src/daemon/daemon-conf.c
trunk/src/daemon/main.c
trunk/src/modules/alsa-util.c
trunk/src/modules/howl-wrap.c
trunk/src/modules/module-alsa-sink.c
trunk/src/modules/module-alsa-source.c
trunk/src/modules/module-cli.c
trunk/src/modules/module-combine.c
trunk/src/modules/module-detect.c
trunk/src/modules/module-esound-compat-spawnfd.c
trunk/src/modules/module-esound-compat-spawnpid.c
trunk/src/modules/module-esound-sink.c
trunk/src/modules/module-lirc.c
trunk/src/modules/module-match.c
trunk/src/modules/module-mmkbd-evdev.c
trunk/src/modules/module-native-protocol-fd.c
trunk/src/modules/module-null-sink.c
trunk/src/modules/module-oss-mmap.c
trunk/src/modules/module-oss.c
trunk/src/modules/module-pipe-sink.c
trunk/src/modules/module-pipe-source.c
trunk/src/modules/module-protocol-stub.c
trunk/src/modules/module-sine.c
trunk/src/modules/module-solaris.c
trunk/src/modules/module-tunnel.c
trunk/src/modules/module-waveout.c
trunk/src/modules/module-x11-bell.c
trunk/src/modules/module-x11-publish.c
trunk/src/modules/module-zeroconf-publish.c
trunk/src/modules/oss-util.c
trunk/src/polyp/browser.c
trunk/src/polyp/client-conf-x11.c
trunk/src/polyp/client-conf.c
trunk/src/polyp/context.c
trunk/src/polyp/mainloop-signal.c
trunk/src/polyp/mainloop.c
trunk/src/polyp/stream.c
trunk/src/polypcore/authkey.c
trunk/src/polypcore/cli.c
trunk/src/polypcore/client.c
trunk/src/polypcore/conf-parser.c
trunk/src/polypcore/core-scache.c
trunk/src/polypcore/core-subscribe.c
trunk/src/polypcore/ioline.c
trunk/src/polypcore/log.c
trunk/src/polypcore/memblockq.c
trunk/src/polypcore/modinfo.c
trunk/src/polypcore/module.c
trunk/src/polypcore/pdispatch.c
trunk/src/polypcore/pid.c
trunk/src/polypcore/protocol-cli.c
trunk/src/polypcore/protocol-esound.c
trunk/src/polypcore/protocol-http.c
trunk/src/polypcore/protocol-native.c
trunk/src/polypcore/protocol-simple.c
trunk/src/polypcore/pstream.c
trunk/src/polypcore/random.c
trunk/src/polypcore/sample-util.c
trunk/src/polypcore/sink-input.c
trunk/src/polypcore/sink.c
trunk/src/polypcore/socket-client.c
trunk/src/polypcore/socket-server.c
trunk/src/polypcore/socket-util.c
trunk/src/polypcore/sound-file-stream.c
trunk/src/polypcore/sound-file.c
trunk/src/polypcore/source-output.c
trunk/src/polypcore/source.c
trunk/src/polypcore/util.c
trunk/src/polypcore/x11wrap.c
trunk/src/utils/pacmd.c
trunk/src/utils/pax11publish.c
Modified: trunk/src/daemon/caps.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/daemon/caps.c (original)
+++ trunk/src/daemon/caps.c Thu Feb 23 03:27:19 2006
@@ -45,7 +45,7 @@
if (uid == 0 || geteuid() != 0)
return;
- pa_log_info(__FILE__": dropping root rights.\n");
+ pa_log_info(__FILE__": dropping root rights.");
#if defined(HAVE_SETRESUID)
setresuid(uid, uid, uid);
@@ -83,7 +83,7 @@
if (cap_set_proc(caps) < 0)
goto fail;
- pa_log_info(__FILE__": dropped capabilities successfully.\n");
+ pa_log_info(__FILE__": dropped capabilities successfully.");
r = 0;
@@ -104,7 +104,7 @@
cap_clear(caps);
if (cap_set_proc(caps) < 0) {
- pa_log(__FILE__": failed to drop capabilities: %s\n", strerror(errno));
+ pa_log(__FILE__": failed to drop capabilities: %s", strerror(errno));
goto fail;
}
Modified: trunk/src/daemon/cmdline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/daemon/cmdline.c (original)
+++ trunk/src/daemon/cmdline.c Thu Feb 23 03:27:19 2006
@@ -191,14 +191,14 @@
case ARG_DAEMONIZE:
case 'D':
if ((conf->daemonize = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --daemonize expects boolean argument\n");
+ pa_log(__FILE__": --daemonize expects boolean argument");
goto fail;
}
break;
case ARG_FAIL:
if ((conf->fail = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --fail expects boolean argument\n");
+ pa_log(__FILE__": --fail expects boolean argument");
goto fail;
}
break;
@@ -208,7 +208,7 @@
if (optarg) {
if (pa_daemon_conf_set_log_level(conf, optarg) < 0) {
- pa_log(__FILE__": --log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error).\n");
+ pa_log(__FILE__": --log-level expects log level argument (either numeric in range 0..4 or one of debug, info, notice, warn, error).");
goto fail;
}
} else {
@@ -220,21 +220,21 @@
case ARG_HIGH_PRIORITY:
if ((conf->high_priority = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --high-priority expects boolean argument\n");
+ pa_log(__FILE__": --high-priority expects boolean argument");
goto fail;
}
break;
case ARG_DISALLOW_MODULE_LOADING:
if ((conf->disallow_module_loading = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --disallow-module-loading expects boolean argument\n");
+ pa_log(__FILE__": --disallow-module-loading expects boolean argument");
goto fail;
}
break;
case ARG_USE_PID_FILE:
if ((conf->use_pid_file = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
- pa_log(__FILE__": --use-pid-file expects boolean argument\n");
+ pa_log(__FILE__": --use-pid-file expects boolean argument");
goto fail;
}
break;
@@ -252,7 +252,7 @@
case ARG_LOG_TARGET:
if (pa_daemon_conf_set_log_target(conf, optarg) < 0) {
- pa_log(__FILE__": Invalid log target: use either 'syslog', 'stderr' or 'auto'.\n");
+ pa_log(__FILE__": Invalid log target: use either 'syslog', 'stderr' or 'auto'.");
goto fail;
}
break;
@@ -271,7 +271,7 @@
case ARG_RESAMPLE_METHOD:
if (pa_daemon_conf_set_resample_method(conf, optarg) < 0) {
- pa_log(__FILE__": Invalid resample method '%s'.\n", optarg);
+ pa_log(__FILE__": Invalid resample method '%s'.", optarg);
goto fail;
}
break;
Modified: trunk/src/daemon/cpulimit.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/daemon/cpulimit.c (original)
+++ trunk/src/daemon/cpulimit.c Thu Feb 23 03:27:19 2006
@@ -169,7 +169,7 @@
/* Prepare the main loop pipe */
if (pipe(the_pipe) < 0) {
- pa_log(__FILE__": pipe() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": pipe() failed: %s", strerror(errno));
return -1;
}
Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Thu Feb 23 03:27:19 2006
@@ -160,7 +160,7 @@
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_target(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Invalid log target '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Invalid log target '%s'.", filename, line, rvalue);
return -1;
}
@@ -172,7 +172,7 @@
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_log_level(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Invalid log level '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Invalid log level '%s'.", filename, line, rvalue);
return -1;
}
@@ -184,7 +184,7 @@
assert(filename && lvalue && rvalue && data);
if (pa_daemon_conf_set_resample_method(c, rvalue) < 0) {
- pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.", filename, line, rvalue);
return -1;
}
@@ -236,7 +236,7 @@
pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file);
if (!f && errno != ENOENT) {
- 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;
}
Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Thu Feb 23 03:27:19 2006
@@ -94,7 +94,7 @@
#endif
static void signal_callback(pa_mainloop_api*m, PA_GCC_UNUSED pa_signal_event *e, int sig, void *userdata) {
- pa_log_info(__FILE__": Got signal %s.\n", pa_strsignal(sig));
+ pa_log_info(__FILE__": Got signal %s.", pa_strsignal(sig));
switch (sig) {
#ifdef SIGUSR1
@@ -112,7 +112,7 @@
#ifdef SIGHUP
case SIGHUP: {
char *c = pa_full_status_string(userdata);
- pa_log_notice(c);
+ pa_log_notice("%s", c);
pa_xfree(c);
return;
}
@@ -121,7 +121,7 @@
case SIGINT:
case SIGTERM:
default:
- pa_log_info(__FILE__": Exiting.\n");
+ pa_log_info(__FILE__": Exiting.");
m->quit(m, 1);
break;
}
@@ -161,7 +161,7 @@
suid_root = getuid() != 0 && geteuid() == 0;
if (suid_root && (pa_uid_in_group("realtime", &gid) <= 0 || gid >= 1000)) {
- pa_log_warn(__FILE__": WARNING: called SUID root, but not in group 'realtime'.\n");
+ pa_log_warn(__FILE__": WARNING: called SUID root, but not in group 'realtime'.");
pa_drop_root();
}
#else
@@ -191,7 +191,7 @@
goto finish;
if (pa_cmdline_parse(conf, argc, argv, &d) < 0) {
- pa_log(__FILE__": failed to parse command line.\n");
+ pa_log(__FILE__": failed to parse command line.");
goto finish;
}
@@ -237,9 +237,9 @@
pid_t pid;
if (pa_pid_file_check_running(&pid) < 0) {
- pa_log_info(__FILE__": daemon not running\n");
+ pa_log_info(__FILE__": daemon not running");
} else {
- pa_log_info(__FILE__": daemon running as PID %u\n", pid);
+ pa_log_info(__FILE__": daemon running as PID %u", pid);
retval = 0;
}
@@ -249,7 +249,7 @@
case PA_CMD_KILL:
if (pa_pid_file_kill(SIGINT, NULL) < 0)
- pa_log(__FILE__": failed to kill daemon.\n");
+ pa_log(__FILE__": failed to kill daemon.");
else
retval = 0;
@@ -264,18 +264,18 @@
int tty_fd;
if (pa_stdio_acquire() < 0) {
- pa_log(__FILE__": failed to acquire stdio.\n");
+ pa_log(__FILE__": failed to acquire stdio.");
goto finish;
}
#ifdef HAVE_FORK
if (pipe(daemon_pipe) < 0) {
- pa_log(__FILE__": failed to create pipe.\n");
+ pa_log(__FILE__": failed to create pipe.");
goto finish;
}
if ((child = fork()) < 0) {
- pa_log(__FILE__": fork() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": fork() failed: %s", strerror(errno));
goto finish;
}
@@ -286,14 +286,14 @@
daemon_pipe[1] = -1;
if (pa_loop_read(daemon_pipe[0], &retval, sizeof(retval)) != sizeof(retval)) {
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
retval = 1;
}
if (retval)
- pa_log(__FILE__": daemon startup failed.\n");
+ pa_log(__FILE__": daemon startup failed.");
else
- pa_log_info(__FILE__": daemon startup successful.\n");
+ pa_log_info(__FILE__": daemon startup successful.");
goto finish;
}
@@ -346,7 +346,7 @@
if (conf->use_pid_file) {
if (pa_pid_file_create() < 0) {
- pa_log(__FILE__": pa_pid_file_create() failed.\n");
+ pa_log(__FILE__": pa_pid_file_create() failed.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
@@ -396,23 +396,22 @@
assert(r == 0);
buf = pa_strbuf_new();
- assert(buf);
if (conf->default_script_file)
r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail);
if (r >= 0)
r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
- pa_log(s = pa_strbuf_tostring_free(buf));
+ pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
pa_xfree(s);
if (r < 0 && conf->fail) {
- pa_log(__FILE__": failed to initialize daemon.\n");
+ pa_log(__FILE__": failed to initialize daemon.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
#endif
} else if (!c->modules || pa_idxset_size(c->modules) == 0) {
- pa_log(__FILE__": daemon startup without any loaded modules, refusing to work.\n");
+ pa_log(__FILE__": daemon startup without any loaded modules, refusing to work.");
#ifdef HAVE_FORK
if (conf->daemonize)
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
@@ -433,13 +432,13 @@
if (c->default_sink_name &&
pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) {
- pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.\n", __FILE__, c->default_sink_name);
+ pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name);
retval = 1;
} else {
- pa_log_info(__FILE__": Daemon startup complete.\n");
+ pa_log_info(__FILE__": Daemon startup complete.");
if (pa_mainloop_run(mainloop, &retval) < 0)
retval = 1;
- pa_log_info(__FILE__": Daemon shutdown initiated.\n");
+ pa_log_info(__FILE__": Daemon shutdown initiated.");
}
}
@@ -453,7 +452,7 @@
pa_signal_done();
pa_mainloop_free(mainloop);
- pa_log_info(__FILE__": Daemon terminated.\n");
+ pa_log_info(__FILE__": Daemon terminated.");
finish:
Modified: trunk/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Thu Feb 23 03:27:19 2006
@@ -63,7 +63,7 @@
goto finish;
if (ss->rate != r)
- pa_log_info(__FILE__": device doesn't support %u Hz, changed to %u Hz.\n", ss->rate, r);
+ pa_log_info(__FILE__": device doesn't support %u Hz, changed to %u Hz.", ss->rate, r);
if (snd_pcm_prepare(pcm_handle) < 0)
goto finish;
Modified: trunk/src/modules/howl-wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/howl-wrap.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/howl-wrap.c (original)
+++ trunk/src/modules/howl-wrap.c Thu Feb 23 03:27:19 2006
@@ -35,7 +35,6 @@
pa_io_event *io_event;
sw_discovery discovery;
-
};
static void howl_io_event(pa_mainloop_api*m, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
@@ -51,7 +50,7 @@
return;
fail:
- pa_log(__FILE__": howl connection died.\n");
+ pa_log_error(__FILE__": howl connection died.");
w->core->mainloop->io_free(w->io_event);
w->io_event = NULL;
}
@@ -62,7 +61,7 @@
assert(c);
if (sw_discovery_init(&session) != SW_OKAY) {
- pa_log("sw_discovery_init() failed.\n");
+ pa_log_error(__FILE__": sw_discovery_init() failed.");
return NULL;
}
Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-sink.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Thu Feb 23 03:27:19 2006
@@ -86,10 +86,10 @@
static void xrun_recovery(struct userdata *u) {
assert(u);
- pa_log(__FILE__": *** ALSA-XRUN (playback) ***\n");
+ pa_log(__FILE__": *** ALSA-XRUN (playback) ***");
if (snd_pcm_prepare(u->pcm_handle) < 0)
- pa_log(__FILE__": snd_pcm_prepare() failed\n");
+ pa_log(__FILE__": snd_pcm_prepare() failed");
}
static void do_write(struct userdata *u) {
@@ -121,7 +121,7 @@
continue;
}
- pa_log(__FILE__": snd_pcm_writei() failed\n");
+ pa_log(__FILE__": snd_pcm_writei() failed");
return;
}
@@ -158,7 +158,7 @@
assert(s && u && u->sink);
if (snd_pcm_delay(u->pcm_handle, &frames) < 0) {
- pa_log(__FILE__": failed to get delay\n");
+ pa_log(__FILE__": failed to get delay");
s->get_latency = NULL;
return 0;
}
@@ -186,13 +186,13 @@
int err;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
frame_size = pa_frame_size(&ss);
@@ -200,7 +200,7 @@
periods = 8;
fragsize = 1024;
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
- pa_log(__FILE__": failed to parse buffer metrics\n");
+ pa_log(__FILE__": failed to parse buffer metrics");
goto fail;
}
period_size = fragsize;
@@ -211,12 +211,12 @@
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) < 0) {
- pa_log(__FILE__": Error opening PCM device %s: %s\n", dev, snd_strerror(err));
+ pa_log(__FILE__": Error opening PCM device %s: %s", dev, snd_strerror(err));
goto fail;
}
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &period_size)) < 0) {
- pa_log(__FILE__": Failed to set hardware parameters: %s\n", snd_strerror(err));
+ pa_log(__FILE__": Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
}
@@ -229,14 +229,14 @@
u->sink->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
if (pa_create_io_events(u->pcm_handle, c->mainloop, &u->io_events, &u->n_io_events, io_callback, u) < 0) {
- pa_log(__FILE__": failed to obtain file descriptors\n");
+ pa_log(__FILE__": failed to obtain file descriptors");
goto fail;
}
u->frame_size = frame_size;
u->fragment_size = period_size;
- pa_log_info(__FILE__": using %u fragments of size %u bytes.\n", periods, u->fragment_size);
+ pa_log_info(__FILE__": using %u fragments of size %u bytes.", periods, u->fragment_size);
u->silence.memblock = pa_memblock_new(u->silence.length = u->fragment_size, c->memblock_stat);
assert(u->silence.memblock);
Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-source.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Thu Feb 23 03:27:19 2006
@@ -85,10 +85,10 @@
static void xrun_recovery(struct userdata *u) {
assert(u);
- pa_log(__FILE__": *** ALSA-XRUN (capture) ***\n");
+ pa_log(__FILE__": *** ALSA-XRUN (capture) ***");
if (snd_pcm_prepare(u->pcm_handle) < 0)
- pa_log(__FILE__": snd_pcm_prepare() failed\n");
+ pa_log(__FILE__": snd_pcm_prepare() failed");
}
static void do_read(struct userdata *u) {
@@ -117,7 +117,7 @@
continue;
}
- pa_log(__FILE__": snd_pcm_readi() failed: %s\n", strerror(-frames));
+ pa_log(__FILE__": snd_pcm_readi() failed: %s", strerror(-frames));
return;
}
@@ -157,7 +157,7 @@
assert(s && u && u->source);
if (snd_pcm_delay(u->pcm_handle, &frames) < 0) {
- pa_log(__FILE__": failed to get delay\n");
+ pa_log(__FILE__": failed to get delay");
s->get_latency = NULL;
return 0;
}
@@ -177,13 +177,13 @@
int err;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
frame_size = pa_frame_size(&ss);
@@ -191,7 +191,7 @@
periods = 12;
fragsize = 1024;
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
- pa_log(__FILE__": failed to parse buffer metrics\n");
+ pa_log(__FILE__": failed to parse buffer metrics");
goto fail;
}
period_size = fragsize;
@@ -202,12 +202,12 @@
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
- pa_log(__FILE__": Error opening PCM device %s: %s\n", dev, snd_strerror(err));
+ pa_log(__FILE__": Error opening PCM device %s: %s", dev, snd_strerror(err));
goto fail;
}
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &period_size)) < 0) {
- pa_log(__FILE__": Failed to set hardware parameters: %s\n", snd_strerror(err));
+ pa_log(__FILE__": Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
}
@@ -220,14 +220,14 @@
u->source->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
if (pa_create_io_events(u->pcm_handle, c->mainloop, &u->io_events, &u->n_io_events, io_callback, u) < 0) {
- pa_log(__FILE__": failed to obtain file descriptors\n");
+ pa_log(__FILE__": failed to obtain file descriptors");
goto fail;
}
u->frame_size = frame_size;
u->fragment_size = period_size;
- pa_log(__FILE__": using %u fragments of size %u bytes.\n", periods, u->fragment_size);
+ pa_log(__FILE__": using %u fragments of size %u bytes.", periods, u->fragment_size);
u->memchunk.memblock = NULL;
u->memchunk.index = u->memchunk.length = 0;
Modified: trunk/src/modules/module-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-cli.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-cli.c (original)
+++ trunk/src/modules/module-cli.c Thu Feb 23 03:27:19 2006
@@ -52,17 +52,17 @@
assert(c && m);
if (c->running_as_daemon) {
- pa_log_info(__FILE__": Running as daemon so won't load this module.\n");
+ pa_log_info(__FILE__": Running as daemon so won't load this module.");
return 0;
}
if (m->argument) {
- pa_log(__FILE__": module doesn't accept arguments.\n");
+ pa_log(__FILE__": module doesn't accept arguments.");
return -1;
}
if (pa_stdio_acquire() < 0) {
- pa_log(__FILE__": STDIN/STDUSE already in use.\n");
+ pa_log(__FILE__": STDIN/STDUSE already in use.");
return -1;
}
Modified: trunk/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-combine.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-combine.c (original)
+++ trunk/src/modules/module-combine.c Thu Feb 23 03:27:19 2006
@@ -112,7 +112,7 @@
target_latency = max_sink_latency > min_total_latency ? max_sink_latency : min_total_latency;
- pa_log_info(__FILE__": [%s] target latency is %0.0f usec.\n", u->sink->name, (float) target_latency);
+ pa_log_info(__FILE__": [%s] target latency is %0.0f usec.", u->sink->name, (float) target_latency);
base_rate = u->sink->sample_spec.rate;
@@ -125,9 +125,9 @@
r += (uint32_t) (((((double) o->total_latency - target_latency))/u->adjust_time)*r/ 1000000);
if (r < (uint32_t) (base_rate*0.9) || r > (uint32_t) (base_rate*1.1))
- pa_log_warn(__FILE__": [%s] sample rates too different, not adjusting (%u vs. %u).\n", o->sink_input->name, base_rate, r);
+ pa_log_warn(__FILE__": [%s] sample rates too different, not adjusting (%u vs. %u).", o->sink_input->name, base_rate, r);
else {
- pa_log_info(__FILE__": [%s] new rate is %u Hz; ratio is %0.3f; latency is %0.0f usec.\n", o->sink_input->name, r, (double) r / base_rate, (float) o->total_latency);
+ pa_log_info(__FILE__": [%s] new rate is %u Hz; ratio is %0.3f; latency is %0.0f usec.", o->sink_input->name, r, (double) r / base_rate, (float) o->total_latency);
pa_sink_input_set_rate(o->sink_input, r);
}
}
@@ -297,13 +297,13 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
if ((rm = pa_modargs_get_value(ma, "resample_method", NULL))) {
if ((resample_method = pa_parse_resample_method(rm)) < 0) {
- pa_log(__FILE__": invalid resample method '%s'\n", rm);
+ pa_log(__FILE__": invalid resample method '%s'", rm);
goto fail;
}
}
@@ -320,22 +320,22 @@
PA_LLIST_HEAD_INIT(struct output, u->outputs);
if (pa_modargs_get_value_u32(ma, "adjust_time", &u->adjust_time) < 0) {
- pa_log(__FILE__": failed to parse adjust_time value\n");
+ pa_log(__FILE__": failed to parse adjust_time value");
goto fail;
}
if (!(master_name = pa_modargs_get_value(ma, "master", NULL)) || !(slaves = pa_modargs_get_value(ma, "slaves", NULL))) {
- pa_log(__FILE__": no master or slave sinks specified\n");
+ pa_log(__FILE__": no master or slave sinks specified");
goto fail;
}
if (!(master_sink = pa_namereg_get(c, master_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": invalid master sink '%s'\n", master_name);
+ pa_log(__FILE__": invalid master sink '%s'", master_name);
goto fail;
}
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &master_sink->sample_spec, &master_sink->channel_map))) {
- pa_log(__FILE__": failed to create sink\n");
+ pa_log(__FILE__": failed to create sink");
goto fail;
}
@@ -345,7 +345,7 @@
u->sink->userdata = u;
if (!(u->master = output_new(u, master_sink, resample_method))) {
- pa_log(__FILE__": failed to create master sink input on sink '%s'.\n", u->sink->name);
+ pa_log(__FILE__": failed to create master sink input on sink '%s'.", u->sink->name);
goto fail;
}
@@ -354,20 +354,20 @@
pa_sink *slave_sink;
if (!(slave_sink = pa_namereg_get(c, n, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": invalid slave sink '%s'\n", n);
+ pa_log(__FILE__": invalid slave sink '%s'", n);
goto fail;
}
pa_xfree(n);
if (!output_new(u, slave_sink, resample_method)) {
- pa_log(__FILE__": failed to create slave sink input on sink '%s'.\n", slave_sink->name);
+ pa_log(__FILE__": failed to create slave sink input on sink '%s'.", slave_sink->name);
goto fail;
}
}
if (u->n_outputs <= 1)
- pa_log_warn(__FILE__": WARNING: no slave sinks specified.\n");
+ pa_log_warn(__FILE__": WARNING: no slave sinks specified.");
if (u->adjust_time > 0) {
pa_gettimeofday(&tv);
Modified: trunk/src/modules/module-detect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-detect.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-detect.c (original)
+++ trunk/src/modules/module-detect.c Thu Feb 23 03:27:19 2006
@@ -66,7 +66,7 @@
if (!(f = fopen("/proc/asound/devices", "r"))) {
if (errno != ENOENT)
- pa_log_error(__FILE__": open(\"/proc/asound/devices\") failed: %s\n", strerror(errno));
+ pa_log_error(__FILE__": open(\"/proc/asound/devices\") failed: %s", strerror(errno));
return -1;
}
@@ -129,7 +129,7 @@
!(f = fopen("/proc/asound/oss/sndstat", "r"))) {
if (errno != ENOENT)
- pa_log_error(__FILE__": failed to open OSS sndstat device: %s\n", strerror(errno));
+ pa_log_error(__FILE__": failed to open OSS sndstat device: %s", strerror(errno));
return -1;
}
@@ -185,7 +185,7 @@
if (stat(dev, &s) < 0) {
if (errno != ENOENT)
- pa_log_error(__FILE__": failed to open device %s: %s\n", dev, strerror(errno));
+ pa_log_error(__FILE__": failed to open device %s: %s", dev, strerror(errno));
return -1;
}
@@ -227,12 +227,12 @@
assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto fail;
}
if (pa_modargs_get_value_boolean(ma, "just-one", &just_one) < 0) {
- pa_log(__FILE__": just_one= expects a boolean argument.\n");
+ pa_log(__FILE__": just_one= expects a boolean argument.");
goto fail;
}
@@ -249,11 +249,11 @@
if ((n = detect_waveout(c, just_one)) <= 0)
#endif
{
- pa_log_warn(__FILE__": failed to detect any sound hardware.\n");
+ pa_log_warn(__FILE__": failed to detect any sound hardware.");
goto fail;
}
- pa_log_info(__FILE__": loaded %i modules.\n", n);
+ pa_log_info(__FILE__": loaded %i modules.", n);
/* We were successful and can unload ourselves now. */
pa_module_unload_request(m);
Modified: trunk/src/modules/module-esound-compat-spawnfd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-compat-spawnfd.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-esound-compat-spawnfd.c (original)
+++ trunk/src/modules/module-esound-compat-spawnfd.c Thu Feb 23 03:27:19 2006
@@ -54,12 +54,12 @@
if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||
pa_modargs_get_value_s32(ma, "fd", &fd) < 0 ||
fd < 0) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto finish;
}
if (pa_loop_write(fd, &x, sizeof(x)) != sizeof(x))
- pa_log(__FILE__": WARNING: write(%u, 1, 1) failed: %s\n", fd, strerror(errno));
+ pa_log(__FILE__": WARNING: write(%u, 1, 1) failed: %s", fd, strerror(errno));
close(fd);
Modified: trunk/src/modules/module-esound-compat-spawnpid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-compat-spawnpid.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-esound-compat-spawnpid.c (original)
+++ trunk/src/modules/module-esound-compat-spawnpid.c Thu Feb 23 03:27:19 2006
@@ -54,12 +54,12 @@
if (!(ma = pa_modargs_new(m->argument, valid_modargs)) ||
pa_modargs_get_value_u32(ma, "pid", &pid) < 0 ||
!pid) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto finish;
}
if (kill(pid, SIGUSR1) < 0)
- pa_log(__FILE__": WARNING: kill(%u) failed: %s\n", pid, strerror(errno));
+ pa_log(__FILE__": WARNING: kill(%u) failed: %s", pid, strerror(errno));
pa_module_unload_request(m);
Modified: trunk/src/modules/module-esound-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-esound-sink.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-esound-sink.c (original)
+++ trunk/src/modules/module-esound-sink.c Thu Feb 23 03:27:19 2006
@@ -127,7 +127,7 @@
assert(u->write_index < u->write_length);
if ((r = pa_iochannel_write(u->io, (uint8_t*) u->write_data + u->write_index, u->write_length - u->write_index)) <= 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return -1;
}
@@ -149,7 +149,7 @@
assert(u->memchunk.memblock && u->memchunk.length);
if ((r = pa_iochannel_write(u->io, (uint8_t*) u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return -1;
}
@@ -174,7 +174,7 @@
/* Process auth data */
if (!*(int32_t*) u->read_data) {
- pa_log(__FILE__": Authentication failed: %s\n", strerror(errno));
+ pa_log(__FILE__": Authentication failed: %s", strerror(errno));
return -1;
}
@@ -199,7 +199,7 @@
/* Process latency info */
u->latency = (pa_usec_t) ((double) (*(int32_t*) u->read_data) * 1000000 / 44100);
if (u->latency > 10000000) {
- pa_log(__FILE__": WARNING! Invalid latency information received from server\n");
+ pa_log(__FILE__": WARNING! Invalid latency information received from server");
u->latency = 0;
}
@@ -244,7 +244,7 @@
assert(u->read_index < u->read_length);
if ((r = pa_iochannel_read(u->io, (uint8_t*) u->read_data + u->read_index, u->read_length - u->read_index)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log(__FILE__": read() failed: %s", r < 0 ? strerror(errno) : "EOF");
cancel(u);
return -1;
}
@@ -304,7 +304,7 @@
u->client = NULL;
if (!io) {
- pa_log(__FILE__": connection failed: %s\n", strerror(errno));
+ pa_log(__FILE__": connection failed: %s", strerror(errno));
cancel(u);
return;
}
@@ -321,19 +321,19 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": invalid sample format specification\n");
+ pa_log(__FILE__": invalid sample format specification");
goto fail;
}
if ((ss.format != PA_SAMPLE_U8 && ss.format != PA_SAMPLE_S16NE) ||
(ss.channels > 2)) {
- pa_log(__FILE__": esound sample type support is limited to mono/stereo and U8 or S16NE sample data\n");
+ pa_log(__FILE__": esound sample type support is limited to mono/stereo and U8 or S16NE sample data");
goto fail;
}
@@ -354,12 +354,12 @@
u->latency = 0;
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create sink.\n");
+ pa_log(__FILE__": failed to create sink.");
goto fail;
}
if (!(u->client = pa_socket_client_new_string(u->core->mainloop, p = pa_modargs_get_value(ma, "server", ESD_UNIX_SOCKET_NAME), ESD_DEFAULT_PORT))) {
- pa_log(__FILE__": failed to connect to server.\n");
+ pa_log(__FILE__": failed to connect to server.");
goto fail;
}
pa_socket_client_set_callback(u->client, on_connection, u);
@@ -367,7 +367,7 @@
/* Prepare the initial request */
u->write_data = pa_xmalloc(u->write_length = ESD_KEY_LEN + sizeof(int32_t));
if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", ".esd_auth"), u->write_data, ESD_KEY_LEN) < 0) {
- pa_log(__FILE__": failed to load cookie\n");
+ pa_log(__FILE__": failed to load cookie");
goto fail;
}
*(int32_t*) ((uint8_t*) u->write_data + ESD_KEY_LEN) = ESD_ENDIAN_KEY;
Modified: trunk/src/modules/module-lirc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-lirc.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-lirc.c (original)
+++ trunk/src/modules/module-lirc.c Thu Feb 23 03:27:19 2006
@@ -69,7 +69,7 @@
assert(u);
if (events & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) {
- pa_log(__FILE__": lost connection to LIRC daemon.\n");
+ pa_log(__FILE__": lost connection to LIRC daemon.");
goto fail;
}
@@ -77,19 +77,19 @@
char *c;
if (lirc_nextcode(&code) != 0 || !code) {
- pa_log(__FILE__": lirc_nextcode() failed.\n");
+ pa_log(__FILE__": lirc_nextcode() failed.");
goto fail;
}
c = pa_xstrdup(code);
c[strcspn(c, "\n\r")] = 0;
- pa_log_debug(__FILE__": raw IR code '%s'\n", c);
+ pa_log_debug(__FILE__": raw IR code '%s'", c);
pa_xfree(c);
while (lirc_code2char(u->config, code, &name) == 0 && name) {
enum { INVALID, UP, DOWN, MUTE, RESET, MUTE_TOGGLE } volchange = INVALID;
- pa_log_info(__FILE__": translated IR code '%s'\n", name);
+ pa_log_info(__FILE__": translated IR code '%s'", name);
if (strcasecmp(name, "volume-up") == 0)
volchange = UP;
@@ -103,12 +103,12 @@
volchange = RESET;
if (volchange == INVALID)
- pa_log_warn(__FILE__": recieved unknown IR code '%s'\n", name);
+ pa_log_warn(__FILE__": recieved unknown IR code '%s'", name);
else {
pa_sink *s;
if (!(s = pa_namereg_get(u->module->core, u->sink_name, PA_NAMEREG_SINK, 1)))
- pa_log(__FILE__": failed to get sink '%s'\n", u->sink_name);
+ pa_log(__FILE__": failed to get sink '%s'", u->sink_name);
else {
pa_volume_t v = pa_cvolume_avg(pa_sink_get_volume(s, PA_MIXER_HARDWARE));
pa_cvolume cv;
@@ -173,12 +173,12 @@
assert(c && m);
if (lirc_in_use) {
- pa_log(__FILE__": module-lirc may no be loaded twice.\n");
+ pa_log(__FILE__": module-lirc may no be loaded twice.");
return -1;
}
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto fail;
}
@@ -191,12 +191,12 @@
u->mute_toggle_save = 0;
if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
- pa_log(__FILE__": lirc_init() failed.\n");
+ pa_log(__FILE__": lirc_init() failed.");
goto fail;
}
if (lirc_readconfig((char*) pa_modargs_get_value(ma, "config", NULL), &u->config, NULL) < 0) {
- pa_log(__FILE__": lirc_readconfig() failed.\n");
+ pa_log(__FILE__": lirc_readconfig() failed.");
goto fail;
}
Modified: trunk/src/modules/module-match.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-match.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-match.c (original)
+++ trunk/src/modules/module-match.c Thu Feb 23 03:27:19 2006
@@ -84,7 +84,7 @@
pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn);
if (!f) {
- pa_log(__FILE__": failed to open file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to open file '%s': %s", fn, strerror(errno));
goto finish;
}
@@ -111,13 +111,13 @@
if (!*v) {
- pa_log(__FILE__ ": [%s:%u] failed to parse line - too few words\n", filename, n);
+ pa_log(__FILE__ ": [%s:%u] failed to parse line - too few words", filename, n);
goto finish;
}
*d = 0;
if (pa_atou(v, &k) < 0) {
- pa_log(__FILE__": [%s:%u] failed to parse volume\n", filename, n);
+ pa_log(__FILE__": [%s:%u] failed to parse volume", filename, n);
goto finish;
}
@@ -125,7 +125,7 @@
if (regcomp(®ex, ln, REG_EXTENDED|REG_NOSUB) != 0) {
- pa_log(__FILE__": [%s:%u] invalid regular expression\n", filename, n);
+ pa_log(__FILE__": [%s:%u] invalid regular expression", filename, n);
goto finish;
}
@@ -173,7 +173,7 @@
for (r = u->rules; r; r = r->next) {
if (!regexec(&r->regex, si->name, 0, NULL, 0)) {
pa_cvolume cv;
- pa_log_debug(__FILE__": changing volume of sink input '%s' to 0x%03x\n", si->name, r->volume);
+ pa_log_debug(__FILE__": changing volume of sink input '%s' to 0x%03x", si->name, r->volume);
pa_cvolume_set(&cv, r->volume, si->sample_spec.channels);
pa_sink_input_set_volume(si, &cv);
}
@@ -186,7 +186,7 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto fail;
}
Modified: trunk/src/modules/module-mmkbd-evdev.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-mmkbd-evdev.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-mmkbd-evdev.c (original)
+++ trunk/src/modules/module-mmkbd-evdev.c Thu Feb 23 03:27:19 2006
@@ -81,7 +81,7 @@
assert(u);
if (events & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) {
- pa_log(__FILE__": lost connection to evdev device.\n");
+ pa_log(__FILE__": lost connection to evdev device.");
goto fail;
}
@@ -89,14 +89,14 @@
struct input_event ev;
if (pa_loop_read(u->fd, &ev, sizeof(ev)) <= 0) {
- pa_log(__FILE__": failed to read from event device: %s\n", strerror(errno));
+ pa_log(__FILE__": failed to read from event device: %s", strerror(errno));
goto fail;
}
if (ev.type == EV_KEY && (ev.value == 1 || ev.value == 2)) {
enum { INVALID, UP, DOWN, MUTE_TOGGLE } volchange = INVALID;
- pa_log_debug(__FILE__": key code=%u, value=%u\n", ev.code, ev.value);
+ pa_log_debug(__FILE__": key code=%u, value=%u", ev.code, ev.value);
switch (ev.code) {
case KEY_VOLUMEDOWN: volchange = DOWN; break;
@@ -108,7 +108,7 @@
pa_sink *s;
if (!(s = pa_namereg_get(u->module->core, u->sink_name, PA_NAMEREG_SINK, 1)))
- pa_log(__FILE__": failed to get sink '%s'\n", u->sink_name);
+ pa_log(__FILE__": failed to get sink '%s'", u->sink_name);
else {
pa_volume_t v = pa_cvolume_avg(pa_sink_get_volume(s, PA_MIXER_HARDWARE));
pa_cvolume cv;
@@ -167,7 +167,7 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto fail;
}
@@ -179,40 +179,40 @@
u->mute_toggle_save = 0;
if ((u->fd = open(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), O_RDONLY)) < 0) {
- pa_log(__FILE__": failed to open evdev device: %s\n", strerror(errno));
+ pa_log(__FILE__": failed to open evdev device: %s", strerror(errno));
goto fail;
}
if (ioctl(u->fd, EVIOCGVERSION, &version) < 0) {
- pa_log(__FILE__": EVIOCGVERSION failed: %s\n", strerror(errno));
- goto fail;
- }
-
- pa_log_info(__FILE__": evdev driver version %i.%i.%i\n", version >> 16, (version >> 8) & 0xff, version & 0xff);
+ pa_log(__FILE__": EVIOCGVERSION failed: %s", strerror(errno));
+ goto fail;
+ }
+
+ pa_log_info(__FILE__": evdev driver version %i.%i.%i", version >> 16, (version >> 8) & 0xff, version & 0xff);
if(ioctl(u->fd, EVIOCGID, &input_id)) {
- pa_log(__FILE__": EVIOCGID failed: %s\n", strerror(errno));
- goto fail;
- }
-
- pa_log_info(__FILE__": evdev vendor 0x%04hx product 0x%04hx version 0x%04hx bustype %u\n",
+ pa_log(__FILE__": EVIOCGID failed: %s", strerror(errno));
+ goto fail;
+ }
+
+ pa_log_info(__FILE__": evdev vendor 0x%04hx product 0x%04hx version 0x%04hx bustype %u",
input_id.vendor, input_id.product, input_id.version, input_id.bustype);
if(ioctl(u->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
- pa_log(__FILE__": EVIOCGNAME failed: %s\n", strerror(errno));
- goto fail;
- }
-
- pa_log_info(__FILE__": evdev device name: %s\n", name);
+ pa_log(__FILE__": EVIOCGNAME failed: %s", strerror(errno));
+ goto fail;
+ }
+
+ pa_log_info(__FILE__": evdev device name: %s", name);
memset(evtype_bitmask, 0, sizeof(evtype_bitmask));
if (ioctl(u->fd, EVIOCGBIT(0, EV_MAX), evtype_bitmask) < 0) {
- pa_log(__FILE__": EVIOCGBIT failed: %s\n", strerror(errno));
+ pa_log(__FILE__": EVIOCGBIT failed: %s", strerror(errno));
goto fail;
}
if (!test_bit(EV_KEY, evtype_bitmask)) {
- pa_log(__FILE__": device has no keys.\n");
+ pa_log(__FILE__": device has no keys.");
goto fail;
}
Modified: trunk/src/modules/module-native-protocol-fd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-native-protocol-fd.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-native-protocol-fd.c (original)
+++ trunk/src/modules/module-native-protocol-fd.c Thu Feb 23 03:27:19 2006
@@ -53,12 +53,12 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto finish;
}
if (pa_modargs_get_value_s32(ma, "fd", &fd) < 0) {
- pa_log(__FILE__": invalid file descriptor.\n");
+ pa_log(__FILE__": invalid file descriptor.");
goto finish;
}
Modified: trunk/src/modules/module-null-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-null-sink.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-null-sink.c (original)
+++ trunk/src/modules/module-null-sink.c Thu Feb 23 03:27:19 2006
@@ -92,13 +92,13 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": invalid sample format specification.\n");
+ pa_log(__FILE__": invalid sample format specification.");
goto fail;
}
@@ -108,7 +108,7 @@
m->userdata = u;
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create sink.\n");
+ pa_log(__FILE__": failed to create sink.");
goto fail;
}
Modified: trunk/src/modules/module-oss-mmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss-mmap.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-oss-mmap.c (original)
+++ trunk/src/modules/module-oss-mmap.c Thu Feb 23 03:27:19 2006
@@ -130,7 +130,7 @@
update_usage(u);
if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETOPTR: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETOPTR: %s", strerror(errno));
return;
}
@@ -192,7 +192,7 @@
update_usage(u);
if (ioctl(u->fd, SNDCTL_DSP_GETIPTR, &info) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETIPTR: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETIPTR: %s", strerror(errno));
return;
}
@@ -225,7 +225,7 @@
struct userdata *u = s->userdata;
if (pa_oss_get_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
- pa_log_info(__FILE__": device doesn't support reading mixer settings: %s\n", strerror(errno));
+ pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
s->get_hw_volume = NULL;
return -1;
}
@@ -237,7 +237,7 @@
struct userdata *u = s->userdata;
if (pa_oss_set_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
- pa_log_info(__FILE__": device doesn't support writing mixer settings: %s\n", strerror(errno));
+ pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
s->set_hw_volume = NULL;
return -1;
}
@@ -265,17 +265,17 @@
u->core = c;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
- pa_log(__FILE__": record= and playback= expect numeric arguments.\n");
+ pa_log(__FILE__": record= and playback= expect numeric arguments.");
goto fail;
}
if (!playback && !record) {
- pa_log(__FILE__": neither playback nor record enabled for device.\n");
+ pa_log(__FILE__": neither playback nor record enabled for device.");
goto fail;
}
@@ -284,13 +284,13 @@
nfrags = 12;
frag_size = 1024;
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
- pa_log(__FILE__": failed to parse fragments arguments\n");
+ pa_log(__FILE__": failed to parse fragments arguments");
goto fail;
}
u->sample_spec = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &u->sample_spec) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
@@ -298,16 +298,16 @@
goto fail;
if (pa_oss_get_hw_description(p, hwdesc, sizeof(hwdesc)) >= 0)
- pa_log_info(__FILE__": hardware name is '%s'.\n", hwdesc);
+ pa_log_info(__FILE__": hardware name is '%s'.", hwdesc);
else
hwdesc[0] = 0;
if (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_REALTIME) || !(caps & DSP_CAP_TRIGGER)) {
- pa_log(__FILE__": OSS device not mmap capable.\n");
- goto fail;
- }
-
- pa_log_info(__FILE__": device opened in %s mode.\n", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
+ pa_log(__FILE__": OSS device not mmap capable.");
+ goto fail;
+ }
+
+ pa_log_info(__FILE__": device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
if (nfrags >= 2 && frag_size >= 1)
if (pa_oss_set_fragments(u->fd, nfrags, frag_size) < 0)
@@ -318,19 +318,19 @@
if (mode != O_WRONLY) {
if (ioctl(u->fd, SNDCTL_DSP_GETISPACE, &info) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETISPACE: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETISPACE: %s", strerror(errno));
goto fail;
}
- pa_log_info(__FILE__": input -- %u fragments of size %u.\n", info.fragstotal, info.fragsize);
+ pa_log_info(__FILE__": input -- %u fragments of size %u.", info.fragstotal, info.fragsize);
u->in_mmap_length = (u->in_fragment_size = info.fragsize) * (u->in_fragments = info.fragstotal);
if ((u->in_mmap = mmap(NULL, u->in_mmap_length, PROT_READ, MAP_SHARED, u->fd, 0)) == MAP_FAILED) {
if (mode == O_RDWR) {
- pa_log(__FILE__": mmap failed for input. Changing to O_WRONLY mode.\n");
+ pa_log(__FILE__": mmap failed for input. Changing to O_WRONLY mode.");
mode = O_WRONLY;
} else {
- pa_log(__FILE__": mmap(): %s\n", strerror(errno));
+ pa_log(__FILE__": mmap(): %s", strerror(errno));
goto fail;
}
} else {
@@ -353,19 +353,19 @@
if (mode != O_RDONLY) {
if (ioctl(u->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETOSPACE: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETOSPACE: %s", strerror(errno));
goto fail;
}
- pa_log_info(__FILE__": output -- %u fragments of size %u.\n", info.fragstotal, info.fragsize);
+ pa_log_info(__FILE__": output -- %u fragments of size %u.", info.fragstotal, info.fragsize);
u->out_mmap_length = (u->out_fragment_size = info.fragsize) * (u->out_fragments = info.fragstotal);
if ((u->out_mmap = mmap(NULL, u->out_mmap_length, PROT_WRITE, MAP_SHARED, u->fd, 0)) == MAP_FAILED) {
if (mode == O_RDWR) {
- pa_log(__FILE__": mmap filed for output. Changing to O_RDONLY mode.\n");
+ pa_log(__FILE__": mmap filed for output. Changing to O_RDONLY mode.");
mode = O_RDONLY;
} else {
- pa_log(__FILE__": mmap(): %s\n", strerror(errno));
+ pa_log(__FILE__": mmap(): %s", strerror(errno));
goto fail;
}
} else {
@@ -392,12 +392,12 @@
zero = 0;
if (ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &zero) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_SETTRIGGER: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_SETTRIGGER: %s", strerror(errno));
goto fail;
}
if (ioctl(u->fd, SNDCTL_DSP_SETTRIGGER, &enable_bits) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_SETTRIGGER: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_SETTRIGGER: %s", strerror(errno));
goto fail;
}
Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Thu Feb 23 03:27:19 2006
@@ -133,7 +133,7 @@
assert(memchunk->length);
if ((r = pa_iochannel_write(u->io, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
break;
}
@@ -186,7 +186,7 @@
if ((r = pa_iochannel_read(u->io, memchunk.memblock->data, memchunk.memblock->length)) < 0) {
pa_memblock_unref(memchunk.memblock);
if (errno != EAGAIN)
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
break;
}
@@ -221,7 +221,7 @@
assert(s && u && u->sink);
if (ioctl(u->fd, SNDCTL_DSP_GETODELAY, &arg) < 0) {
- pa_log_info(__FILE__": device doesn't support SNDCTL_DSP_GETODELAY: %s\n", strerror(errno));
+ pa_log_info(__FILE__": device doesn't support SNDCTL_DSP_GETODELAY: %s", strerror(errno));
s->get_latency = NULL;
return 0;
}
@@ -257,7 +257,7 @@
struct userdata *u = s->userdata;
if (pa_oss_get_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
- pa_log_info(__FILE__": device doesn't support reading mixer settings: %s\n", strerror(errno));
+ pa_log_info(__FILE__": device doesn't support reading mixer settings: %s", strerror(errno));
s->get_hw_volume = NULL;
return -1;
}
@@ -269,7 +269,7 @@
struct userdata *u = s->userdata;
if (pa_oss_set_volume(u->fd, &s->sample_spec, &s->hw_volume) < 0) {
- pa_log_info(__FILE__": device doesn't support writing mixer settings: %s\n", strerror(errno));
+ pa_log_info(__FILE__": device doesn't support writing mixer settings: %s", strerror(errno));
s->set_hw_volume = NULL;
return -1;
}
@@ -293,17 +293,17 @@
assert(m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
- pa_log(__FILE__": record= and playback= expect numeric argument.\n");
+ pa_log(__FILE__": record= and playback= expect numeric argument.");
goto fail;
}
if (!playback && !record) {
- pa_log(__FILE__": neither playback nor record enabled for device.\n");
+ pa_log(__FILE__": neither playback nor record enabled for device.");
goto fail;
}
@@ -312,13 +312,13 @@
nfrags = 12;
frag_size = 1024;
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
- pa_log(__FILE__": failed to parse fragments arguments\n");
+ pa_log(__FILE__": failed to parse fragments arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
@@ -326,11 +326,11 @@
goto fail;
if (pa_oss_get_hw_description(p, hwdesc, sizeof(hwdesc)) >= 0)
- pa_log_info(__FILE__": hardware name is '%s'.\n", hwdesc);
+ pa_log_info(__FILE__": hardware name is '%s'.", hwdesc);
else
hwdesc[0] = 0;
- pa_log_info(__FILE__": device opened in %s mode.\n", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
+ pa_log_info(__FILE__": device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
if (nfrags >= 2 && frag_size >= 1)
if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0)
@@ -340,7 +340,7 @@
goto fail;
if (ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &frag_size) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETBLKSIZE: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETBLKSIZE: %s", strerror(errno));
goto fail;
}
assert(frag_size);
@@ -351,13 +351,13 @@
u->use_getospace = u->use_getispace = 0;
if (ioctl(fd, SNDCTL_DSP_GETISPACE, &info) >= 0) {
- pa_log_info(__FILE__": input -- %u fragments of size %u.\n", info.fragstotal, info.fragsize);
+ pa_log_info(__FILE__": input -- %u fragments of size %u.", info.fragstotal, info.fragsize);
in_frag_size = info.fragsize;
u->use_getispace = 1;
}
if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) >= 0) {
- pa_log_info(__FILE__": output -- %u fragments of size %u.\n", info.fragstotal, info.fragsize);
+ pa_log_info(__FILE__": output -- %u fragments of size %u.", info.fragstotal, info.fragsize);
out_frag_size = info.fragsize;
u->use_getospace = 1;
}
Modified: trunk/src/modules/module-pipe-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-sink.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-pipe-sink.c (original)
+++ trunk/src/modules/module-pipe-sink.c Thu Feb 23 03:27:19 2006
@@ -91,7 +91,7 @@
assert(u->memchunk.memblock && u->memchunk.length);
if ((r = pa_iochannel_write(u->io, (uint8_t*) u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return;
}
@@ -141,32 +141,32 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": invalid sample format specification\n");
+ pa_log(__FILE__": invalid sample format specification");
goto fail;
}
mkfifo(p = pa_modargs_get_value(ma, "file", DEFAULT_FIFO_NAME), 0777);
if ((fd = open(p, O_RDWR)) < 0) {
- pa_log(__FILE__": open('%s'): %s\n", p, strerror(errno));
+ pa_log(__FILE__": open('%s'): %s", p, strerror(errno));
goto fail;
}
pa_fd_set_cloexec(fd, 1);
if (fstat(fd, &st) < 0) {
- pa_log(__FILE__": fstat('%s'): %s\n", p, strerror(errno));
+ pa_log(__FILE__": fstat('%s'): %s", p, strerror(errno));
goto fail;
}
if (!S_ISFIFO(st.st_mode)) {
- pa_log(__FILE__": '%s' is not a FIFO.\n", p);
+ pa_log(__FILE__": '%s' is not a FIFO.", p);
goto fail;
}
@@ -177,7 +177,7 @@
m->userdata = u;
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create sink.\n");
+ pa_log(__FILE__": failed to create sink.");
goto fail;
}
u->sink->notify = notify_cb;
Modified: trunk/src/modules/module-pipe-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-pipe-source.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-pipe-source.c (original)
+++ trunk/src/modules/module-pipe-source.c Thu Feb 23 03:27:19 2006
@@ -88,7 +88,7 @@
assert(u->chunk.memblock && u->chunk.memblock->length > u->chunk.index);
if ((r = pa_iochannel_read(u->io, (uint8_t*) u->chunk.memblock->data + u->chunk.index, u->chunk.memblock->length - u->chunk.index)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
return;
}
@@ -119,32 +119,32 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": invalid sample format specification\n");
+ pa_log(__FILE__": invalid sample format specification");
goto fail;
}
mkfifo(p = pa_modargs_get_value(ma, "file", DEFAULT_FIFO_NAME), 0777);
if ((fd = open(p, O_RDWR)) < 0) {
- pa_log(__FILE__": open('%s'): %s\n", p, strerror(errno));
+ pa_log(__FILE__": open('%s'): %s", p, strerror(errno));
goto fail;
}
pa_fd_set_cloexec(fd, 1);
if (fstat(fd, &st) < 0) {
- pa_log(__FILE__": fstat('%s'): %s\n", p, strerror(errno));
+ pa_log(__FILE__": fstat('%s'): %s", p, strerror(errno));
goto fail;
}
if (!S_ISFIFO(st.st_mode)) {
- pa_log(__FILE__": '%s' is not a FIFO.\n", p);
+ pa_log(__FILE__": '%s' is not a FIFO.", p);
goto fail;
}
@@ -154,7 +154,7 @@
u->core = c;
if (!(u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create source.\n");
+ pa_log(__FILE__": failed to create source.");
goto fail;
}
u->source->userdata = u;
Modified: trunk/src/modules/module-protocol-stub.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-protocol-stub.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-protocol-stub.c (original)
+++ trunk/src/modules/module-protocol-stub.c Thu Feb 23 03:27:19 2006
@@ -161,12 +161,12 @@
const char *listen_on;
if (pa_modargs_get_value_boolean(ma, "loopback", &loopback) < 0) {
- pa_log(__FILE__": loopback= expects a boolean argument.\n");
+ pa_log(__FILE__": loopback= expects a boolean argument.");
return NULL;
}
if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port < 1 || port > 0xFFFF) {
- pa_log(__FILE__": port= expects a numerical argument between 1 and 65535.\n");
+ pa_log(__FILE__": port= expects a numerical argument between 1 and 65535.");
return NULL;
}
@@ -194,12 +194,12 @@
pa_runtime_path(v, tmp, sizeof(tmp));
if (pa_make_secure_parent_dir(tmp) < 0) {
- pa_log(__FILE__": Failed to create secure socket directory.\n");
+ pa_log(__FILE__": Failed to create secure socket directory.");
return NULL;
}
if ((r = pa_unix_socket_remove_stale(tmp)) < 0) {
- pa_log(__FILE__": Failed to remove stale UNIX socket '%s': %s\n", tmp, strerror(errno));
+ pa_log(__FILE__": Failed to remove stale UNIX socket '%s': %s", tmp, strerror(errno));
return NULL;
}
@@ -220,7 +220,7 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto finish;
}
@@ -246,9 +246,9 @@
#if defined(USE_PROTOCOL_ESOUND) && !defined(USE_TCP_SOCKETS)
if (remove(ESD_UNIX_SOCKET_NAME) != 0)
- pa_log("%s: Failed to remove %s : %s.\n", __FILE__, ESD_UNIX_SOCKET_NAME, strerror (errno));
+ pa_log("%s: Failed to remove %s : %s.", __FILE__, ESD_UNIX_SOCKET_NAME, strerror (errno));
if (remove(ESD_UNIX_SOCKET_DIR) != 0)
- pa_log("%s: Failed to remove %s : %s.\n", __FILE__, ESD_UNIX_SOCKET_DIR, strerror (errno));
+ pa_log("%s: Failed to remove %s : %s.", __FILE__, ESD_UNIX_SOCKET_DIR, strerror (errno));
#endif
protocol_free(m->userdata);
Modified: trunk/src/modules/module-sine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-sine.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-sine.c (original)
+++ trunk/src/modules/module-sine.c Thu Feb 23 03:27:19 2006
@@ -110,7 +110,7 @@
char t[256];
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments\n");
+ pa_log(__FILE__": Failed to parse module arguments");
goto fail;
}
@@ -123,7 +123,7 @@
sink_name = pa_modargs_get_value(ma, "sink", NULL);
if (!(sink = pa_namereg_get(c, sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": No such sink.\n");
+ pa_log(__FILE__": No such sink.");
goto fail;
}
@@ -133,7 +133,7 @@
frequency = 440;
if (pa_modargs_get_value_u32(ma, "frequency", &frequency) < 0 || frequency < 1 || frequency > ss.rate/2) {
- pa_log(__FILE__": Invalid frequency specification\n");
+ pa_log(__FILE__": Invalid frequency specification");
goto fail;
}
Modified: trunk/src/modules/module-solaris.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-solaris.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-solaris.c (original)
+++ trunk/src/modules/module-solaris.c Thu Feb 23 03:27:19 2006
@@ -150,7 +150,7 @@
len = memchunk->length;
if ((r = pa_iochannel_write(u->io, (uint8_t*) memchunk->memblock->data + memchunk->index, len)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return;
}
@@ -172,7 +172,7 @@
* Write 0 bytes which will generate a SIGPOLL when "played".
*/
if (write(u->fd, NULL, 0) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return;
}
}
@@ -196,7 +196,7 @@
if ((r = pa_iochannel_read(u->io, memchunk.memblock->data, memchunk.memblock->length)) < 0) {
pa_memblock_unref(memchunk.memblock);
if (errno != EAGAIN)
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
return;
}
@@ -283,9 +283,9 @@
if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
if (errno == EINVAL)
- pa_log(__FILE__": AUDIO_SETINFO: Unsupported volume.\n");
+ pa_log(__FILE__": AUDIO_SETINFO: Unsupported volume.");
else
- pa_log(__FILE__": AUDIO_SETINFO: %s\n", strerror(errno));
+ pa_log(__FILE__": AUDIO_SETINFO: %s", strerror(errno));
return -1;
}
@@ -349,9 +349,9 @@
if (ioctl(fd, AUDIO_SETINFO, &info) < 0) {
if (errno == EINVAL)
- pa_log(__FILE__": AUDIO_SETINFO: Unsupported sample format.\n");
+ pa_log(__FILE__": AUDIO_SETINFO: Unsupported sample format.");
else
- pa_log(__FILE__": AUDIO_SETINFO: %s\n", strerror(errno));
+ pa_log(__FILE__": AUDIO_SETINFO: %s", strerror(errno));
return -1;
}
@@ -367,9 +367,9 @@
if (ioctl(fd, AUDIO_SETINFO, &info) < 0) {
if (errno == EINVAL)
- pa_log(__FILE__": AUDIO_SETINFO: Unsupported buffer size.\n");
+ pa_log(__FILE__": AUDIO_SETINFO: Unsupported buffer size.");
else
- pa_log(__FILE__": AUDIO_SETINFO: %s\n", strerror(errno));
+ pa_log(__FILE__": AUDIO_SETINFO: %s", strerror(errno));
return -1;
}
@@ -388,17 +388,17 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
- pa_log(__FILE__": record= and playback= expect numeric argument.\n");
+ pa_log(__FILE__": record= and playback= expect numeric argument.");
goto fail;
}
if (!playback && !record) {
- pa_log(__FILE__": neither playback nor record enabled for device.\n");
+ pa_log(__FILE__": neither playback nor record enabled for device.");
goto fail;
}
@@ -406,20 +406,20 @@
buffer_size = 16384;
if (pa_modargs_get_value_s32(ma, "buffer_size", &buffer_size) < 0) {
- pa_log(__FILE__": failed to parse buffer size argument\n");
+ pa_log(__FILE__": failed to parse buffer size argument");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
if ((fd = open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), mode | O_NONBLOCK)) < 0)
goto fail;
- pa_log_info(__FILE__": device opened in %s mode.\n", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
+ pa_log_info(__FILE__": device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR"));
if (pa_solaris_auto_format(fd, mode, &ss) < 0)
goto fail;
Modified: trunk/src/modules/module-tunnel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-tunnel.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-tunnel.c (original)
+++ trunk/src/modules/module-tunnel.c Thu Feb 23 03:27:19 2006
@@ -182,7 +182,7 @@
struct userdata *u = userdata;
assert(pd && t && u && u->pdispatch == pd);
- pa_log(__FILE__": stream killed\n");
+ pa_log(__FILE__": stream killed");
die(u);
}
@@ -232,13 +232,13 @@
if (pa_tagstruct_getu32(t, &channel) < 0 ||
pa_tagstruct_getu32(t, &bytes) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid protocol reply\n");
+ pa_log(__FILE__": invalid protocol reply");
die(u);
return;
}
if (channel != u->channel) {
- pa_log(__FILE__": recieved data for invalid channel\n");
+ pa_log(__FILE__": recieved data for invalid channel");
die(u);
return;
}
@@ -260,9 +260,9 @@
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to get latency.\n");
+ pa_log(__FILE__": failed to get latency.");
else
- pa_log(__FILE__": protocol error.\n");
+ pa_log(__FILE__": protocol error.");
die(u);
return;
}
@@ -276,7 +276,7 @@
pa_tagstruct_get_timeval(t, &remote) < 0 ||
pa_tagstruct_getu64(t, &counter) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid reply.\n");
+ pa_log(__FILE__": invalid reply.");
die(u);
return;
}
@@ -303,7 +303,7 @@
u->host_latency = 0;
#endif
-/* pa_log(__FILE__": estimated host latency: %0.0f usec\n", (double) u->host_latency); */
+/* pa_log(__FILE__": estimated host latency: %0.0f usec", (double) u->host_latency); */
}
static void request_latency(struct userdata *u) {
@@ -335,9 +335,9 @@
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to create stream.\n");
+ pa_log(__FILE__": failed to create stream.");
else
- pa_log(__FILE__": protocol error.\n");
+ pa_log(__FILE__": protocol error.");
die(u);
return;
}
@@ -348,7 +348,7 @@
pa_tagstruct_getu32(t, &u->requested_bytes) < 0 ||
#endif
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid reply.\n");
+ pa_log(__FILE__": invalid reply.");
die(u);
return;
}
@@ -367,9 +367,9 @@
if (command != PA_COMMAND_REPLY || !pa_tagstruct_eof(t)) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to authenticate\n");
+ pa_log(__FILE__": failed to authenticate");
else
- pa_log(__FILE__": protocol error.\n");
+ pa_log(__FILE__": protocol error.");
die(u);
return;
}
@@ -426,7 +426,7 @@
struct userdata *u = userdata;
assert(p && u);
- pa_log(__FILE__": stream died.\n");
+ pa_log(__FILE__": stream died.");
die(u);
}
@@ -436,7 +436,7 @@
assert(p && packet && u);
if (pa_pdispatch_run(u->pdispatch, packet, u) < 0) {
- pa_log(__FILE__": invalid packet\n");
+ pa_log(__FILE__": invalid packet");
die(u);
}
}
@@ -447,7 +447,7 @@
assert(p && chunk && u);
if (channel != u->channel) {
- pa_log(__FILE__": recieved memory block on bad channel.\n");
+ pa_log(__FILE__": recieved memory block on bad channel.");
die(u);
return;
}
@@ -466,7 +466,7 @@
u->client = NULL;
if (!io) {
- pa_log(__FILE__": connection failed.\n");
+ pa_log(__FILE__": connection failed.");
pa_module_unload_request(u->module);
return;
}
@@ -544,7 +544,7 @@
u->auth_cookie_in_property = 0;
if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) {
- pa_log_debug(__FILE__": using already loaded auth cookie.\n");
+ pa_log_debug(__FILE__": using already loaded auth cookie.");
pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
u->auth_cookie_in_property = 1;
return 0;
@@ -556,7 +556,7 @@
if (pa_authkey_load_auto(fn, u->auth_cookie, sizeof(u->auth_cookie)) < 0)
return -1;
- pa_log_debug(__FILE__": loading cookie from disk.\n");
+ pa_log_debug(__FILE__": loading cookie from disk.");
if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0)
u->auth_cookie_in_property = 1;
@@ -572,7 +572,7 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
@@ -602,18 +602,18 @@
goto fail;
if (!(u->server_name = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL)))) {
- pa_log(__FILE__": no server specified.\n");
+ pa_log(__FILE__": no server specified.");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": invalid sample format specification\n");
+ pa_log(__FILE__": invalid sample format specification");
goto fail;
}
if (!(u->client = pa_socket_client_new_string(c->mainloop, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
- pa_log(__FILE__": failed to connect to server '%s'\n", u->server_name);
+ pa_log(__FILE__": failed to connect to server '%s'", u->server_name);
goto fail;
}
@@ -624,7 +624,7 @@
#ifdef TUNNEL_SINK
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create sink.\n");
+ pa_log(__FILE__": failed to create sink.");
goto fail;
}
@@ -636,7 +636,7 @@
pa_sink_set_owner(u->sink, m);
#else
if (!(u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, NULL))) {
- pa_log(__FILE__": failed to create source.\n");
+ pa_log(__FILE__": failed to create source.");
goto fail;
}
Modified: trunk/src/modules/module-waveout.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-waveout.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-waveout.c (original)
+++ trunk/src/modules/module-waveout.c Thu Feb 23 03:27:19 2006
@@ -159,12 +159,12 @@
res = waveOutPrepareHeader(u->hwo, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR) {
- pa_log_error(__FILE__ ": ERROR: Unable to prepare waveOut block: %d\n",
+ pa_log_error(__FILE__ ": ERROR: Unable to prepare waveOut block: %d",
res);
}
res = waveOutWrite(u->hwo, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR) {
- pa_log_error(__FILE__ ": ERROR: Unable to write waveOut block: %d\n",
+ pa_log_error(__FILE__ ": ERROR: Unable to write waveOut block: %d",
res);
}
@@ -214,12 +214,12 @@
res = waveInPrepareHeader(u->hwi, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR) {
- pa_log_error(__FILE__ ": ERROR: Unable to prepare waveIn block: %d\n",
+ pa_log_error(__FILE__ ": ERROR: Unable to prepare waveIn block: %d",
res);
}
res = waveInAddBuffer(u->hwi, hdr, sizeof(WAVEHDR));
if (res != MMSYSERR_NOERROR) {
- pa_log_error(__FILE__ ": ERROR: Unable to add waveIn block: %d\n",
+ pa_log_error(__FILE__ ": ERROR: Unable to add waveIn block: %d",
res);
}
@@ -378,7 +378,7 @@
wf->wFormatTag = WAVE_FORMAT_PCM;
if (ss->channels > 2) {
- pa_log_error(__FILE__": ERROR: More than two channels not supported.\n");
+ pa_log_error(__FILE__": ERROR: More than two channels not supported.");
return -1;
}
@@ -391,7 +391,7 @@
case 44100:
break;
default:
- pa_log_error(__FILE__": ERROR: Unsupported sample rate.\n");
+ pa_log_error(__FILE__": ERROR: Unsupported sample rate.");
return -1;
}
@@ -402,7 +402,7 @@
else if (ss->format == PA_SAMPLE_S16NE)
wf->wBitsPerSample = 16;
else {
- pa_log_error(__FILE__": ERROR: Unsupported sample format.\n");
+ pa_log_error(__FILE__": ERROR: Unsupported sample format.");
return -1;
}
@@ -429,30 +429,30 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
if (pa_modargs_get_value_boolean(ma, "record", &record) < 0 || pa_modargs_get_value_boolean(ma, "playback", &playback) < 0) {
- pa_log(__FILE__": record= and playback= expect boolean argument.\n");
+ pa_log(__FILE__": record= and playback= expect boolean argument.");
goto fail;
}
if (!playback && !record) {
- pa_log(__FILE__": neither playback nor record enabled for device.\n");
+ pa_log(__FILE__": neither playback nor record enabled for device.");
goto fail;
}
nfrags = 20;
frag_size = 1024;
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
- pa_log(__FILE__": failed to parse fragments arguments\n");
+ pa_log(__FILE__": failed to parse fragments arguments");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification\n");
+ pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
@@ -466,13 +466,13 @@
goto fail;
if (waveInStart(hwi) != MMSYSERR_NOERROR)
goto fail;
- pa_log_debug(__FILE__": Opened waveIn subsystem.\n");
+ pa_log_debug(__FILE__": Opened waveIn subsystem.");
}
if (playback) {
if (waveOutOpen(&hwo, WAVE_MAPPER, &wf, (DWORD_PTR)chunk_done_cb, (DWORD_PTR)u, CALLBACK_FUNCTION) != MMSYSERR_NOERROR)
goto fail;
- pa_log_debug(__FILE__": Opened waveOut subsystem.\n");
+ pa_log_debug(__FILE__": Opened waveOut subsystem.");
}
InitializeCriticalSection(&u->crit);
Modified: trunk/src/modules/module-x11-bell.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-bell.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-x11-bell.c (original)
+++ trunk/src/modules/module-x11-bell.c Thu Feb 23 03:27:19 2006
@@ -71,7 +71,7 @@
assert(u);
if (!(s = pa_namereg_get(u->core, u->sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": Invalid sink: %s\n", u->sink_name);
+ pa_log(__FILE__": Invalid sink: %s", u->sink_name);
return -1;
}
@@ -90,7 +90,7 @@
bne = (XkbBellNotifyEvent*) e;
if (ring_bell(u, bne->percent) < 0) {
- pa_log_info(__FILE__": Ringing bell failed, reverting to X11 device bell.\n");
+ pa_log_info(__FILE__": Ringing bell failed, reverting to X11 device bell.");
XkbForceDeviceBell(pa_x11_wrapper_get_display(w), bne->device, bne->bell_class, bne->bell_id, bne->percent);
}
@@ -105,7 +105,7 @@
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
@@ -124,7 +124,7 @@
minor = XkbMinorVersion;
if (!XkbLibraryVersion(&major, &minor)) {
- pa_log(__FILE__": XkbLibraryVersion() failed\n");
+ pa_log(__FILE__": XkbLibraryVersion() failed");
goto fail;
}
@@ -133,7 +133,7 @@
if (!XkbQueryExtension(u->display, NULL, &u->xkb_event_base, NULL, &major, &minor)) {
- pa_log(__FILE__": XkbQueryExtension() failed\n");
+ pa_log(__FILE__": XkbQueryExtension() failed");
goto fail;
}
Modified: trunk/src/modules/module-x11-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-publish.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-x11-publish.c (original)
+++ trunk/src/modules/module-x11-publish.c Thu Feb 23 03:27:19 2006
@@ -78,7 +78,7 @@
u->auth_cookie_in_property = 0;
if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) {
- pa_log_debug(__FILE__": using already loaded auth cookie.\n");
+ pa_log_debug(__FILE__": using already loaded auth cookie.");
pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
u->auth_cookie_in_property = 1;
return 0;
@@ -90,7 +90,7 @@
if (pa_authkey_load_auto(fn, u->auth_cookie, sizeof(u->auth_cookie)) < 0)
return -1;
- pa_log_debug(__FILE__": loading cookie from disk.\n");
+ pa_log_debug(__FILE__": loading cookie from disk.");
if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0)
u->auth_cookie_in_property = 1;
@@ -108,7 +108,7 @@
pa_strlist *l;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments\n");
+ pa_log(__FILE__": failed to parse module arguments");
goto fail;
}
@@ -169,7 +169,7 @@
/* Yes, here is a race condition */
if (!pa_x11_get_prop(u->display, "POLYP_ID", t, sizeof(t)) || strcmp(t, u->id))
- pa_log("WARNING: Polypaudio information vanished from X11!\n");
+ pa_log_warn(__FILE__": Polypaudio information vanished from X11!");
else {
pa_x11_del_prop(u->display, "POLYP_ID");
pa_x11_del_prop(u->display, "POLYP_SERVER");
Modified: trunk/src/modules/module-zeroconf-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-zeroconf-publish.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/module-zeroconf-publish.c (original)
+++ trunk/src/modules/module-zeroconf-publish.c Thu Feb 23 03:27:19 2006
@@ -141,7 +141,7 @@
snprintf(t, sizeof(t), "Networked Audio Device %s on %s", s->name, pa_get_host_name(hn, sizeof(hn)));
if (sw_text_record_init(&txt) != SW_OKAY) {
- pa_log(__FILE__": sw_text_record_init() failed\n");
+ pa_log(__FILE__": sw_text_record_init() failed");
goto finish;
}
free_txt = 1;
@@ -168,7 +168,7 @@
s->loaded.type == PA_NAMEREG_SINK ? SERVICE_NAME_SINK : SERVICE_NAME_SOURCE,
NULL, NULL, u->port, sw_text_record_bytes(txt), sw_text_record_len(txt),
publish_reply, s, &s->oid) != SW_OKAY) {
- pa_log(__FILE__": failed to register sink on zeroconf.\n");
+ pa_log(__FILE__": failed to register sink on zeroconf.");
goto finish;
}
@@ -179,7 +179,7 @@
s->autoload.type == PA_NAMEREG_SINK ? SERVICE_NAME_SINK : SERVICE_NAME_SOURCE,
NULL, NULL, u->port, sw_text_record_bytes(txt), sw_text_record_len(txt),
publish_reply, s, &s->oid) != SW_OKAY) {
- pa_log(__FILE__": failed to register sink on zeroconf.\n");
+ pa_log(__FILE__": failed to register sink on zeroconf.");
goto finish;
}
@@ -391,12 +391,12 @@
sw_text_record txt;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments.\n");
+ pa_log(__FILE__": failed to parse module arguments.");
goto fail;
}
if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port == 0 || port >= 0xFFFF) {
- pa_log(__FILE__": invalid port specified.\n");
+ pa_log(__FILE__": invalid port specified.");
goto fail;
}
@@ -433,7 +433,7 @@
snprintf(t, sizeof(t), "Networked Audio Server on %s", pa_get_host_name(hn, sizeof(hn)));
if (sw_text_record_init(&txt) != SW_OKAY) {
- pa_log(__FILE__": sw_text_record_init() failed\n");
+ pa_log(__FILE__": sw_text_record_init() failed");
goto fail;
}
free_txt = 1;
@@ -444,7 +444,7 @@
SERVICE_NAME_SERVER,
NULL, NULL, u->port, sw_text_record_bytes(txt), sw_text_record_len(txt),
publish_reply, u, &u->server_oid) != SW_OKAY) {
- pa_log(__FILE__": failed to register server on zeroconf.\n");
+ pa_log(__FILE__": failed to register server on zeroconf.");
goto fail;
}
Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Thu Feb 23 03:27:19 2006
@@ -51,7 +51,7 @@
tcaps = pcaps ? pcaps : &dcaps;
if (ioctl(fd, SNDCTL_DSP_GETCAPS, tcaps) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s", strerror(errno));
goto fail;
}
@@ -63,20 +63,20 @@
if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY)) < 0) {
if ((fd = open(device, (*mode = O_RDONLY)|O_NDELAY)) < 0) {
- pa_log(__FILE__": open('%s'): %s\n", device, strerror(errno));
+ pa_log(__FILE__": open('%s'): %s", device, strerror(errno));
goto fail;
}
}
} else {
if ((fd = open(device, *mode|O_NDELAY)) < 0) {
- pa_log(__FILE__": open('%s'): %s\n", device, strerror(errno));
+ pa_log(__FILE__": open('%s'): %s", device, strerror(errno));
goto fail;
}
}
if (pcaps) {
if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_GETCAPS: %s", strerror(errno));
goto fail;
}
}
@@ -114,7 +114,7 @@
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
format = AFMT_U8;
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
- pa_log(__FILE__": SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_SETFMT: %s", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
return -1;
} else
ss->format = PA_SAMPLE_U8;
@@ -126,7 +126,7 @@
channels = ss->channels;
if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_CHANNELS: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_CHANNELS: %s", strerror(errno));
return -1;
}
assert(channels);
@@ -134,7 +134,7 @@
speed = ss->rate;
if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_SPEED: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_SPEED: %s", strerror(errno));
return -1;
}
assert(speed);
@@ -160,7 +160,7 @@
arg = ((int) nfrags << 16) | simple_log2(frag_size);
if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) {
- pa_log(__FILE__": SNDCTL_DSP_SETFRAGMENT: %s\n", strerror(errno));
+ pa_log(__FILE__": SNDCTL_DSP_SETFRAGMENT: %s", strerror(errno));
return -1;
}
@@ -183,7 +183,7 @@
if ((volume->channels = ss->channels) >= 2)
volume->values[1] = (((vol >> 8) & 0xFF) * PA_VOLUME_NORM) / 100;
- pa_log_debug(__FILE__": Read mixer settings: %s\n", pa_cvolume_snprint(cv, sizeof(cv), volume));
+ pa_log_debug(__FILE__": Read mixer settings: %s", pa_cvolume_snprint(cv, sizeof(cv), volume));
return 0;
}
@@ -199,7 +199,7 @@
if (ioctl(fd, SOUND_MIXER_WRITE_PCM, &vol) < 0)
return -1;
- pa_log_debug(__FILE__": Wrote mixer settings: %s\n", pa_cvolume_snprint(cv, sizeof(cv), volume));
+ pa_log_debug(__FILE__": Wrote mixer settings: %s", pa_cvolume_snprint(cv, sizeof(cv), volume));
return 0;
}
@@ -228,7 +228,7 @@
!(f = fopen("/proc/asound/oss/sndstat", "r"))) {
if (errno != ENOENT)
- pa_log_warn(__FILE__": failed to open OSS sndstat device: %s\n", strerror(errno));
+ pa_log_warn(__FILE__": failed to open OSS sndstat device: %s", strerror(errno));
return -1;
}
Modified: trunk/src/polyp/browser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/browser.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/browser.c (original)
+++ trunk/src/polyp/browser.c Thu Feb 23 03:27:19 2006
@@ -48,7 +48,7 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: trunk/src/polyp/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf-x11.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/client-conf-x11.c (original)
+++ trunk/src/polyp/client-conf-x11.c Thu Feb 23 03:27:19 2006
@@ -45,7 +45,7 @@
goto finish;
if (!(d = XOpenDisplay(dname))) {
- pa_log(__FILE__": XOpenDisplay() failed\n");
+ pa_log(__FILE__": XOpenDisplay() failed");
goto finish;
}
@@ -68,7 +68,7 @@
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;
}
Modified: trunk/src/polyp/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/client-conf.c (original)
+++ trunk/src/polyp/client-conf.c Thu Feb 23 03:27:19 2006
@@ -122,7 +122,7 @@
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;
}
Modified: trunk/src/polyp/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/context.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/context.c (original)
+++ trunk/src/polyp/context.c Thu Feb 23 03:27:19 2006
@@ -424,7 +424,7 @@
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 @@
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 @@
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 @@
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 @@
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)) ||
Modified: trunk/src/polyp/mainloop-signal.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/mainloop-signal.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/mainloop-signal.c (original)
+++ trunk/src/polyp/mainloop-signal.c Thu Feb 23 03:27:19 2006
@@ -104,12 +104,12 @@
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 @@
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 @@
#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;
}
Modified: trunk/src/polyp/mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/mainloop.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/mainloop.c (original)
+++ trunk/src/polyp/mainloop.c Thu Feb 23 03:27:19 2006
@@ -145,7 +145,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
Modified: trunk/src/polyp/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/stream.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polyp/stream.c (original)
+++ trunk/src/polyp/stream.c Thu Feb 23 03:27:19 2006
@@ -289,7 +289,7 @@
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 @@
}
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;
Modified: trunk/src/polypcore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/authkey.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/authkey.c (original)
+++ trunk/src/polypcore/authkey.c Thu Feb 23 03:27:19 2006
@@ -52,7 +52,7 @@
ftruncate(fd, 0);
if ((r = pa_loop_write(fd, ret_data, length)) < 0 || (size_t) r != length) {
- pa_log(__FILE__": failed to write cookie file: %s\n", strerror(errno));
+ pa_log(__FILE__": failed to write cookie file: %s", strerror(errno));
return -1;
}
@@ -70,7 +70,7 @@
if ((fd = open(fn, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
if (errno != EACCES || (fd = open(fn, O_RDONLY)) < 0) {
- pa_log(__FILE__": failed to open cookie file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to open cookie file '%s': %s", fn, strerror(errno));
goto finish;
} else
writable = 0;
@@ -79,14 +79,14 @@
unlock = pa_lock_fd(fd, 1) >= 0;
if ((r = pa_loop_read(fd, data, length)) < 0) {
- pa_log(__FILE__": failed to read cookie file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to read cookie file '%s': %s", fn, strerror(errno));
goto finish;
}
if ((size_t) r != length) {
if (!writable) {
- pa_log(__FILE__": unable to write cookie to read only file\n");
+ pa_log(__FILE__": unable to write cookie to read only file");
goto finish;
}
@@ -118,7 +118,7 @@
ret = load(path, data, length);
if (ret < 0)
- pa_log(__FILE__": Failed to load authorization key '%s': %s\n", path,
+ pa_log(__FILE__": Failed to load authorization key '%s': %s", path,
(ret == -1) ? strerror(errno) : "file corrupt");
return ret;
@@ -175,14 +175,14 @@
return -2;
if ((fd = open(p, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
- pa_log(__FILE__": failed to open cookie file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to open cookie file '%s': %s", fn, strerror(errno));
goto finish;
}
unlock = pa_lock_fd(fd, 1) >= 0;
if ((r = pa_loop_write(fd, data, length)) < 0 || (size_t) r != length) {
- pa_log(__FILE__": failed to read cookie file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to read cookie file '%s': %s", fn, strerror(errno));
goto finish;
}
Modified: trunk/src/polypcore/cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/cli.c (original)
+++ trunk/src/polypcore/cli.c Thu Feb 23 03:27:19 2006
@@ -103,7 +103,7 @@
assert(client && client->userdata);
c = client->userdata;
- pa_log_debug(__FILE__": CLI client killed.\n");
+ pa_log_debug(__FILE__": CLI client killed.");
if (c->defer_kill)
c->kill_requested = 1;
else {
@@ -119,7 +119,7 @@
assert(line && c);
if (!s) {
- pa_log_debug(__FILE__": CLI got EOF from user.\n");
+ pa_log_debug(__FILE__": CLI got EOF from user.");
if (c->eof_callback)
c->eof_callback(c, c->userdata);
Modified: trunk/src/polypcore/client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/client.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/client.c (original)
+++ trunk/src/polypcore/client.c Thu Feb 23 03:27:19 2006
@@ -51,7 +51,7 @@
r = pa_idxset_put(core->clients, c, &c->index);
assert(c->index != PA_IDXSET_INVALID && r >= 0);
- pa_log_info(__FILE__": created %u \"%s\"\n", c->index, c->name);
+ pa_log_info(__FILE__": created %u \"%s\"", c->index, c->name);
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_CLIENT|PA_SUBSCRIPTION_EVENT_NEW, c->index);
pa_core_check_quit(core);
@@ -66,7 +66,7 @@
pa_core_check_quit(c->core);
- pa_log_info(__FILE__": freed %u \"%s\"\n", c->index, c->name);
+ pa_log_info(__FILE__": freed %u \"%s\"", c->index, c->name);
pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CLIENT|PA_SUBSCRIPTION_EVENT_REMOVE, c->index);
pa_xfree(c->name);
pa_xfree(c->driver);
@@ -76,7 +76,7 @@
void pa_client_kill(pa_client *c) {
assert(c);
if (!c->kill) {
- pa_log_warn(__FILE__": kill() operation not implemented for client %u\n", c->index);
+ pa_log_warn(__FILE__": kill() operation not implemented for client %u", c->index);
return;
}
Modified: trunk/src/polypcore/conf-parser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/conf-parser.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/conf-parser.c (original)
+++ trunk/src/polypcore/conf-parser.c Thu Feb 23 03:27:19 2006
@@ -45,7 +45,7 @@
if (!strcmp(lvalue, t->lvalue))
return t->parse(filename, line, lvalue, rvalue, t->data, userdata);
- pa_log(__FILE__": [%s:%u] Unknown lvalue '%s'.\n", filename, line, lvalue);
+ pa_log(__FILE__": [%s:%u] Unknown lvalue '%s'.", filename, line, lvalue);
return -1;
}
@@ -88,7 +88,7 @@
return 0;
if (!(e = strchr(b, '='))) {
- pa_log(__FILE__": [%s:%u] Missing '='.\n", filename, line);
+ pa_log(__FILE__": [%s:%u] Missing '='.", filename, line);
return -1;
}
@@ -111,7 +111,7 @@
goto finish;
}
- 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;
}
@@ -121,7 +121,7 @@
if (feof(f))
break;
- pa_log(__FILE__": WARNING: failed to read configuration file '%s': %s\n", filename, strerror(errno));
+ pa_log(__FILE__": WARNING: failed to read configuration file '%s': %s", filename, strerror(errno));
goto finish;
}
@@ -145,7 +145,7 @@
assert(filename && lvalue && rvalue && data);
if (pa_atoi(rvalue, &k) < 0) {
- pa_log(__FILE__": [%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return -1;
}
@@ -158,7 +158,7 @@
assert(filename && lvalue && rvalue && data);
if ((k = pa_parse_boolean(rvalue)) < 0) {
- pa_log(__FILE__": [%s:%u] Failed to parse boolean value: %s\n", filename, line, rvalue);
+ pa_log(__FILE__": [%s:%u] Failed to parse boolean value: %s", filename, line, rvalue);
return -1;
}
Modified: trunk/src/polypcore/core-scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-scache.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/core-scache.c (original)
+++ trunk/src/polypcore/core-scache.c Thu Feb 23 03:27:19 2006
@@ -341,7 +341,7 @@
e = pa_path_get_filename(pathname);
if (stat(pathname, &st) < 0) {
- pa_log(__FILE__": stat('%s') failed: %s\n", pathname, strerror(errno));
+ pa_log(__FILE__": stat('%s') failed: %s", pathname, strerror(errno));
return;
}
@@ -363,7 +363,7 @@
/* If that fails, try to open it as shell glob */
if (glob(pathname, GLOB_ERR|GLOB_NOSORT, NULL, &p) < 0) {
- pa_log(__FILE__": Failed to open directory: %s\n", strerror(errno));
+ pa_log(__FILE__": Failed to open directory: %s", strerror(errno));
return -1;
}
Modified: trunk/src/polypcore/core-subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-subscribe.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/core-subscribe.c (original)
+++ trunk/src/polypcore/core-subscribe.c Thu Feb 23 03:27:19 2006
@@ -158,7 +158,7 @@
break;
}
- pa_log(__FILE__": %u\n", e->index);
+ pa_log(__FILE__": %u", e->index);
}*/
/* Deferred callback for dispatching subscirption events */
Modified: trunk/src/polypcore/ioline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/ioline.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/ioline.c (original)
+++ trunk/src/polypcore/ioline.c Thu Feb 23 03:27:19 2006
@@ -274,7 +274,7 @@
pa_ioline_puts(l, "\nExiting.\n");
do_write(l);
} else if (r < 0) {
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
failure(l);
return -1;
}
@@ -296,7 +296,7 @@
while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length) {
if ((r = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log(__FILE__": write() failed: %s", r < 0 ? strerror(errno) : "EOF");
failure(l);
return -1;
}
Modified: trunk/src/polypcore/log.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/log.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/log.c (original)
+++ trunk/src/polypcore/log.c Thu Feb 23 03:27:19 2006
@@ -26,6 +26,8 @@
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
@@ -73,6 +75,8 @@
void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
const char *e;
+ char *text, *t, *n;
+
assert(level < PA_LOG_LEVEL_MAX);
if ((e = getenv(ENV_LOGLEVEL)))
@@ -81,30 +85,54 @@
if (level > maximal_level)
return;
- switch (log_target) {
- case PA_LOG_STDERR:
- vfprintf(stderr, format, ap);
- break;
+ text = pa_vsprintf_malloc(format, ap);
+ for (t = text; t; t = n) {
+ if ((n = strchr(t, '\n'))) {
+ *n = 0;
+ n++;
+ }
+
+ if (!*t)
+ continue;
+
+ switch (log_target) {
+ case PA_LOG_STDERR: {
+ const char *prefix = "", *suffix = "";
+
+ /* Yes indeed. Useless, but fun! */
+ if (isatty(STDERR_FILENO)) {
+ if (level <= PA_LOG_ERROR) {
+ prefix = "\x1B[1;31m";
+ suffix = "\x1B[0m";
+ } else if (level <= PA_LOG_WARN) {
+ prefix = "\x1B[1m";
+ suffix = "\x1B[0m";
+ }
+ }
+ fprintf(stderr, "%s%s%s\n", prefix, t, suffix);
+ break;
+ }
+
#ifdef HAVE_SYSLOG_H
- case PA_LOG_SYSLOG:
- openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER);
- vsyslog(level_to_syslog[level], format, ap);
- closelog();
- break;
+ case PA_LOG_SYSLOG:
+ openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER);
+ syslog(level_to_syslog[level], "%s", t);
+ closelog();
+ break;
#endif
+
+ case PA_LOG_USER:
+ user_log_func(level, t);
+ break;
+
+ case PA_LOG_NULL:
+ default:
+ break;
+ }
+ }
- case PA_LOG_USER: {
- char *t = pa_vsprintf_malloc(format, ap);
- assert(user_log_func);
- user_log_func(level, t);
- pa_xfree(t);
- }
-
- case PA_LOG_NULL:
- default:
- break;
- }
+ pa_xfree(text);
}
Modified: trunk/src/polypcore/memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memblockq.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/memblockq.c (original)
+++ trunk/src/polypcore/memblockq.c Thu Feb 23 03:27:19 2006
@@ -76,7 +76,7 @@
bq->read_index = bq->write_index = idx;
bq->memblock_stat = s;
- pa_log_debug(__FILE__": memblockq requested: maxlength=%u, tlength=%u, base=%u, prebuf=%u, minreq=%u\n", maxlength, tlength, base, prebuf, minreq);
+ pa_log_debug(__FILE__": memblockq requested: maxlength=%u, tlength=%u, base=%u, prebuf=%u, minreq=%u", maxlength, tlength, base, prebuf, minreq);
bq->maxlength = ((maxlength+base-1)/base)*base;
assert(bq->maxlength >= base);
@@ -98,7 +98,7 @@
if (!bq->minreq)
bq->minreq = 1;
- pa_log_debug(__FILE__": memblockq sanitized: maxlength=%u, tlength=%u, base=%u, prebuf=%u, minreq=%u\n", bq->maxlength, bq->tlength, bq->base, bq->prebuf, bq->minreq);
+ pa_log_debug(__FILE__": memblockq sanitized: maxlength=%u, tlength=%u, base=%u, prebuf=%u, minreq=%u", bq->maxlength, bq->tlength, bq->base, bq->prebuf, bq->minreq);
bq->state = bq->prebuf ? PREBUF : RUNNING;
bq->silence = silence ? pa_memblock_ref(silence) : NULL;
Modified: trunk/src/polypcore/modinfo.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/modinfo.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/modinfo.c (original)
+++ trunk/src/polypcore/modinfo.c Thu Feb 23 03:27:19 2006
@@ -65,7 +65,7 @@
assert(name);
if (!(dl = lt_dlopenext(name))) {
- pa_log(__FILE__": Failed to open module \"%s\": %s\n", name, lt_dlerror());
+ pa_log(__FILE__": Failed to open module \"%s\": %s", name, lt_dlerror());
return NULL;
}
Modified: trunk/src/polypcore/module.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/module.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/module.c (original)
+++ trunk/src/polypcore/module.c Thu Feb 23 03:27:19 2006
@@ -69,17 +69,17 @@
m->argument = pa_xstrdup(argument);
if (!(m->dl = lt_dlopenext(name))) {
- pa_log(__FILE__": Failed to open module \"%s\": %s\n", name, lt_dlerror());
+ pa_log(__FILE__": Failed to open module \"%s\": %s", name, lt_dlerror());
goto fail;
}
if (!(m->init = (int (*)(pa_core *_c, pa_module*_m)) lt_dlsym(m->dl, PA_SYMBOL_INIT))) {
- pa_log(__FILE__": Failed to load module \"%s\": symbol \""PA_SYMBOL_INIT"\" not found.\n", name);
+ pa_log(__FILE__": Failed to load module \"%s\": symbol \""PA_SYMBOL_INIT"\" not found.", name);
goto fail;
}
if (!(m->done = (void (*)(pa_core *_c, pa_module*_m)) lt_dlsym(m->dl, PA_SYMBOL_DONE))) {
- pa_log(__FILE__": Failed to load module \"%s\": symbol \""PA_SYMBOL_DONE"\" not found.\n", name);
+ pa_log(__FILE__": Failed to load module \"%s\": symbol \""PA_SYMBOL_DONE"\" not found.", name);
goto fail;
}
@@ -91,7 +91,7 @@
assert(m->init);
if (m->init(c, m) < 0) {
- pa_log_error(__FILE__": Failed to load module \"%s\" (argument: \"%s\"): initialization failed.\n", name, argument ? argument : "");
+ pa_log_error(__FILE__": Failed to load module \"%s\" (argument: \"%s\"): initialization failed.", name, argument ? argument : "");
goto fail;
}
@@ -110,7 +110,7 @@
r = pa_idxset_put(c->modules, m, &m->index);
assert(r >= 0 && m->index != PA_IDXSET_INVALID);
- pa_log_info(__FILE__": Loaded \"%s\" (index: #%u; argument: \"%s\").\n", m->name, m->index, m->argument ? m->argument : "");
+ pa_log_info(__FILE__": Loaded \"%s\" (index: #%u; argument: \"%s\").", m->name, m->index, m->argument ? m->argument : "");
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_MODULE|PA_SUBSCRIPTION_EVENT_NEW, m->index);
@@ -137,13 +137,13 @@
if (m->core->disallow_module_loading)
return;
- pa_log_info(__FILE__": Unloading \"%s\" (index: #%u).\n", m->name, m->index);
+ pa_log_info(__FILE__": Unloading \"%s\" (index: #%u).", m->name, m->index);
m->done(m->core, m);
lt_dlclose(m->dl);
- pa_log_info(__FILE__": Unloaded \"%s\" (index: #%u).\n", m->name, m->index);
+ pa_log_info(__FILE__": Unloaded \"%s\" (index: #%u).", m->name, m->index);
pa_subscription_post(m->core, PA_SUBSCRIPTION_EVENT_MODULE|PA_SUBSCRIPTION_EVENT_REMOVE, m->index);
Modified: trunk/src/polypcore/pdispatch.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pdispatch.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/pdispatch.c (original)
+++ trunk/src/polypcore/pdispatch.c Thu Feb 23 03:27:19 2006
@@ -196,7 +196,7 @@
if (!(p = command_names[command]))
snprintf((char*) (p = t), sizeof(t), "%u", command);
- pa_log(__FILE__": Recieved opcode <%s>\n", p);
+ pa_log(__FILE__": Recieved opcode <%s>", p);
}
#endif
@@ -215,7 +215,7 @@
(*c)(pd, command, tag, ts, userdata);
} else {
- pa_log(__FILE__": Recieved unsupported command %u\n", command);
+ pa_log(__FILE__": Recieved unsupported command %u", command);
goto finish;
}
Modified: trunk/src/polypcore/pid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pid.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/pid.c (original)
+++ trunk/src/polypcore/pid.c Thu Feb 23 03:27:19 2006
@@ -54,7 +54,7 @@
assert(fn && fd >= 0);
if ((r = pa_loop_read(fd, t, sizeof(t)-1)) < 0) {
- pa_log(__FILE__": WARNING: failed to read PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": WARNING: failed to read PID file '%s': %s", fn, strerror(errno));
return (pid_t) -1;
}
@@ -66,7 +66,7 @@
*e = 0;
if (pa_atou(t, &pid) < 0) {
- pa_log(__FILE__": WARNING: failed to parse PID file '%s'\n", fn);
+ pa_log(__FILE__": WARNING: failed to parse PID file '%s'", fn);
return (pid_t) -1;
}
@@ -84,7 +84,7 @@
if ((fd = open(fn, mode, S_IRUSR|S_IWUSR)) < 0) {
if (mode != O_RDONLY || errno != ENOENT)
- pa_log(__FILE__": WARNING: failed to open PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": WARNING: failed to open PID file '%s': %s", fn, strerror(errno));
goto fail;
}
@@ -93,7 +93,7 @@
goto fail;
if (fstat(fd, &st) < 0) {
- pa_log(__FILE__": Failed to fstat() PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": Failed to fstat() PID file '%s': %s", fn, strerror(errno));
goto fail;
}
@@ -105,7 +105,7 @@
goto fail;
if (close(fd) < 0) {
- pa_log(__FILE__": Failed to close file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": Failed to close file '%s': %s", fn, strerror(errno));
goto fail;
}
@@ -145,7 +145,7 @@
goto fail;
if ((pid = read_pid(fn, fd)) == (pid_t) -1)
- pa_log(__FILE__": corrupt PID file, overwriting.\n");
+ pa_log(__FILE__": corrupt PID file, overwriting.");
else if (pid > 0) {
#ifdef OS_IS_WIN32
if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid)) != NULL) {
@@ -153,16 +153,16 @@
#else
if (kill(pid, 0) >= 0 || errno != ESRCH) {
#endif
- pa_log(__FILE__": daemon already running.\n");
- goto fail;
- }
-
- pa_log(__FILE__": stale PID file, overwriting.\n");
+ pa_log(__FILE__": daemon already running.");
+ goto fail;
+ }
+
+ pa_log(__FILE__": stale PID file, overwriting.");
}
/* Overwrite the current PID file */
if (lseek(fd, 0, SEEK_SET) == (off_t) -1 || ftruncate(fd, 0) < 0) {
- pa_log(__FILE__": failed to truncate PID fil: %s.\n", strerror(errno));
+ pa_log(__FILE__": failed to truncate PID fil: %s.", strerror(errno));
goto fail;
}
@@ -170,7 +170,7 @@
l = strlen(t);
if (pa_loop_write(fd, t, l) != (ssize_t) l) {
- pa_log(__FILE__": failed to write PID file.\n");
+ pa_log(__FILE__": failed to write PID file.");
goto fail;
}
@@ -195,7 +195,7 @@
pa_runtime_path("pid", fn, sizeof(fn));
if ((fd = open_pid_file(fn, O_RDWR)) < 0) {
- pa_log(__FILE__": WARNING: failed to open PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": WARNING: failed to open PID file '%s': %s", fn, strerror(errno));
goto fail;
}
@@ -203,12 +203,12 @@
goto fail;
if (pid != getpid()) {
- pa_log(__FILE__": WARNING: PID file '%s' not mine!\n", fn);
+ pa_log(__FILE__": WARNING: PID file '%s' not mine!", fn);
goto fail;
}
if (ftruncate(fd, 0) < 0) {
- pa_log(__FILE__": failed to truncate PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to truncate PID file '%s': %s", fn, strerror(errno));
goto fail;
}
@@ -219,7 +219,7 @@
#endif
if (unlink(fn) < 0) {
- pa_log(__FILE__": failed to remove PID file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to remove PID file '%s': %s", fn, strerror(errno));
goto fail;
}
Modified: trunk/src/polypcore/protocol-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-cli.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-cli.c (original)
+++ trunk/src/polypcore/protocol-cli.c Thu Feb 23 03:27:19 2006
@@ -55,7 +55,7 @@
assert(s && io && p);
if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
- pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
pa_iochannel_free(io);
return;
}
Modified: trunk/src/polypcore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-esound.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-esound.c (original)
+++ trunk/src/polypcore/protocol-esound.c Thu Feb 23 03:27:19 2006
@@ -269,7 +269,7 @@
if (!c->authorized) {
if (memcmp(data, c->protocol->esd_key, ESD_KEY_LEN) != 0) {
- pa_log(__FILE__": kicked client with invalid authorization key.\n");
+ pa_log(__FILE__": kicked client with invalid authorization key.");
return -1;
}
@@ -286,7 +286,7 @@
else if (ekey == ESD_SWAP_ENDIAN_KEY)
c->swap_byte_order = 1;
else {
- pa_log(__FILE__": client sent invalid endian key\n");
+ pa_log(__FILE__": client sent invalid endian key");
return -1;
}
@@ -311,12 +311,12 @@
format_esd2native(format, c->swap_byte_order, &ss);
if (!pa_sample_spec_valid(&ss)) {
- pa_log(__FILE__": invalid sample specification\n");
+ pa_log(__FILE__": invalid sample specification");
return -1;
}
if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": no such sink\n");
+ pa_log(__FILE__": no such sink");
return -1;
}
@@ -328,7 +328,7 @@
assert(!c->sink_input && !c->input_memblockq);
if (!(c->sink_input = pa_sink_input_new(sink, __FILE__, name, &ss, NULL, 0, -1))) {
- pa_log(__FILE__": failed to create sink input.\n");
+ pa_log(__FILE__": failed to create sink input.");
return -1;
}
@@ -375,7 +375,7 @@
format_esd2native(format, c->swap_byte_order, &ss);
if (!pa_sample_spec_valid(&ss)) {
- pa_log(__FILE__": invalid sample specification.\n");
+ pa_log(__FILE__": invalid sample specification.");
return -1;
}
@@ -383,19 +383,19 @@
pa_sink* sink;
if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": no such sink.\n");
+ pa_log(__FILE__": no such sink.");
return -1;
}
if (!(source = sink->monitor_source)) {
- pa_log(__FILE__": no such monitor source.\n");
+ pa_log(__FILE__": no such monitor source.");
return -1;
}
} else {
assert(request == ESD_PROTO_STREAM_REC);
if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, 1))) {
- pa_log(__FILE__": no such source.\n");
+ pa_log(__FILE__": no such source.");
return -1;
}
}
@@ -408,7 +408,7 @@
assert(!c->output_memblockq && !c->source_output);
if (!(c->source_output = pa_source_output_new(source, __FILE__, name, &ss, NULL, -1))) {
- pa_log(__FILE__": failed to create source output\n");
+ pa_log(__FILE__": failed to create source output");
return -1;
}
@@ -733,14 +733,14 @@
static int do_read(struct connection *c) {
assert(c && c->io);
-/* pa_log("READ\n"); */
+/* pa_log("READ"); */
if (c->state == ESD_NEXT_REQUEST) {
ssize_t r;
assert(c->read_data_length < sizeof(c->request));
if ((r = pa_iochannel_read(c->io, ((uint8_t*) &c->request) + c->read_data_length, sizeof(c->request) - c->read_data_length)) <= 0) {
- pa_log_debug(__FILE__": read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log_debug(__FILE__": read() failed: %s", r < 0 ? strerror(errno) : "EOF");
return -1;
}
@@ -750,16 +750,16 @@
c->request = MAYBE_INT32_SWAP(c->swap_byte_order, c->request);
if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) {
- pa_log(__FILE__": recieved invalid request.\n");
+ pa_log(__FILE__": recieved invalid request.");
return -1;
}
handler = proto_map+c->request;
-/* pa_log(__FILE__": executing request #%u\n", c->request); */
+/* pa_log(__FILE__": executing request #%u", c->request); */
if (!handler->proc) {
- pa_log(__FILE__": recieved unimplemented request #%u.\n", c->request);
+ pa_log(__FILE__": recieved unimplemented request #%u.", c->request);
return -1;
}
@@ -788,7 +788,7 @@
assert(c->read_data && c->read_data_length < handler->data_length);
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) {
- pa_log_debug(__FILE__": read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log_debug(__FILE__": read() failed: %s", r < 0 ? strerror(errno) : "EOF");
return -1;
}
@@ -808,7 +808,7 @@
assert(c->scache.memchunk.memblock && c->scache.name && c->scache.memchunk.index < c->scache.memchunk.length);
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->scache.memchunk.memblock->data+c->scache.memchunk.index, c->scache.memchunk.length-c->scache.memchunk.index)) <= 0) {
- pa_log_debug(__FILE__": read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log_debug(__FILE__": read() failed: %s", r < 0 ? strerror(errno) : "EOF");
return -1;
}
@@ -843,7 +843,7 @@
assert(c->input_memblockq);
-/* pa_log("STREAMING_DATA\n"); */
+/* pa_log("STREAMING_DATA"); */
if (!(l = pa_memblockq_missing(c->input_memblockq)))
return 0;
@@ -865,7 +865,7 @@
}
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
- pa_log_debug(__FILE__": read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
+ pa_log_debug(__FILE__": read() failed: %s", r < 0 ? strerror(errno) : "EOF");
return -1;
}
@@ -888,14 +888,14 @@
static int do_write(struct connection *c) {
assert(c && c->io);
-/* pa_log("WRITE\n"); */
+/* pa_log("WRITE"); */
if (c->write_data_length) {
ssize_t r;
assert(c->write_data_index < c->write_data_length);
if ((r = pa_iochannel_write(c->io, (uint8_t*) c->write_data+c->write_data_index, c->write_data_length-c->write_data_index)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
return -1;
}
@@ -914,7 +914,7 @@
if ((r = pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->data+chunk.index, chunk.length)) < 0) {
pa_memblock_unref(chunk.memblock);
- pa_log(__FILE__": write(): %s\n", strerror(errno));
+ pa_log(__FILE__": write(): %s", strerror(errno));
return -1;
}
@@ -967,7 +967,7 @@
struct connection *c = userdata;
assert(io && c && c->io == io);
-/* pa_log("IO\n"); */
+/* pa_log("IO"); */
do_work(c);
}
@@ -978,7 +978,7 @@
struct connection *c = userdata;
assert(a && c && c->defer_event == e);
-/* pa_log("DEFER\n"); */
+/* pa_log("DEFER"); */
do_work(c);
}
@@ -1005,7 +1005,7 @@
struct connection*c = i->userdata;
assert(i && c && length);
-/* pa_log("DROP\n"); */
+/* pa_log("DROP"); */
pa_memblockq_drop(c->input_memblockq, chunk, length);
@@ -1072,7 +1072,7 @@
assert(s && io && p);
if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
- pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
pa_iochannel_free(io);
return;
}
@@ -1142,7 +1142,7 @@
p = pa_xmalloc(sizeof(pa_protocol_esound));
if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
- pa_log(__FILE__": public= expects a boolean argument.\n");
+ pa_log(__FILE__": public= expects a boolean argument.");
return NULL;
}
Modified: trunk/src/polypcore/protocol-http.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-http.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-http.c (original)
+++ trunk/src/polypcore/protocol-http.c Thu Feb 23 03:27:19 2006
@@ -143,7 +143,7 @@
/* We're done */
c->state = DATA;
- pa_log_info(__FILE__": request for %s\n", c->url);
+ pa_log_info(__FILE__": request for %s", c->url);
if (!strcmp(c->url, URL_ROOT)) {
char txt[256];
@@ -222,7 +222,7 @@
assert(s && io && p);
if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
- pa_log_warn(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_log_warn(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
pa_iochannel_free(io);
return;
}
Modified: trunk/src/polypcore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-native.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-native.c (original)
+++ trunk/src/polypcore/protocol-native.c Thu Feb 23 03:27:19 2006
@@ -507,7 +507,7 @@
pa_tagstruct_putu32(t, l);
pa_pstream_send_tagstruct(s->connection->pstream, t);
-/* pa_log(__FILE__": Requesting %u bytes\n", l); */
+/* pa_log(__FILE__": Requesting %u bytes", l); */
}
static void send_memblock(struct connection *c) {
@@ -585,11 +585,11 @@
}
if (pa_memblockq_peek(s->memblockq, chunk) < 0) {
-/* pa_log(__FILE__": peek: failure\n"); */
+/* pa_log(__FILE__": peek: failure"); */
return -1;
}
-/* pa_log(__FILE__": peek: %u\n", chunk->length); */
+/* pa_log(__FILE__": peek: %u", chunk->length); */
return 0;
}
@@ -608,7 +608,7 @@
s->drain_request = 0;
}
-/* pa_log(__FILE__": after_drop: %u %u\n", pa_memblockq_get_length(s->memblockq), pa_memblockq_is_readable(s->memblockq)); */
+/* pa_log(__FILE__": after_drop: %u %u", pa_memblockq_get_length(s->memblockq), pa_memblockq_is_readable(s->memblockq)); */
}
static void sink_input_kill_cb(pa_sink_input *i) {
@@ -622,7 +622,7 @@
assert(i && i->userdata);
s = i->userdata;
- /*pa_log(__FILE__": get_latency: %u\n", pa_memblockq_get_length(s->memblockq));*/
+ /*pa_log(__FILE__": get_latency: %u", pa_memblockq_get_length(s->memblockq));*/
return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &s->sink_input->sample_spec);
}
@@ -635,7 +635,7 @@
s = o->userdata;
if (pa_memblockq_push_align(s->memblockq, chunk) < 0) {
- pa_log_warn(__FILE__": Failed to push data into output queue.\n");
+ pa_log_warn(__FILE__": Failed to push data into output queue.");
return;
}
@@ -654,7 +654,7 @@
assert(o && o->userdata);
s = o->userdata;
- /*pa_log(__FILE__": get_latency: %u\n", pa_memblockq_get_length(s->memblockq));*/
+ /*pa_log(__FILE__": get_latency: %u", pa_memblockq_get_length(s->memblockq));*/
return pa_bytes_to_usec(pa_memblockq_get_length(s->memblockq), &o->sample_spec);
}
@@ -662,7 +662,7 @@
/*** pdispatch callbacks ***/
static void protocol_error(struct connection *c) {
- pa_log(__FILE__": protocol error, kicking client\n");
+ pa_log(__FILE__": protocol error, kicking client");
connection_free(c);
}
@@ -868,7 +868,7 @@
if (!c->authorized) {
if (memcmp(c->protocol->auth_cookie, cookie, PA_NATIVE_COOKIE_LENGTH) != 0) {
- pa_log(__FILE__": Denied access to client with invalid authorization key.\n");
+ pa_log(__FILE__": Denied access to client with invalid authorization key.");
pa_pstream_send_error(c->pstream, tag, PA_ERR_ACCESS);
return;
}
@@ -958,10 +958,10 @@
pa_memblockq_prebuf_disable(s->memblockq);
if (!pa_memblockq_is_readable(s->memblockq)) {
-/* pa_log("immediate drain: %u\n", pa_memblockq_get_length(s->memblockq)); */
+/* pa_log("immediate drain: %u", pa_memblockq_get_length(s->memblockq)); */
pa_pstream_send_simple_ack(c->pstream, tag);
} else {
-/* pa_log("slow drain triggered\n"); */
+/* pa_log("slow drain triggered"); */
s->drain_request = 1;
s->drain_tag = tag;
@@ -1967,7 +1967,7 @@
assert(p && packet && packet->data && c);
if (pa_pdispatch_run(c->pdispatch, packet, c) < 0) {
- pa_log(__FILE__": invalid packet.\n");
+ pa_log(__FILE__": invalid packet.");
connection_free(c);
}
}
@@ -1978,7 +1978,7 @@
assert(p && chunk && userdata);
if (!(stream = pa_idxset_get_by_index(c->output_streams, channel))) {
- pa_log(__FILE__": client sent block for invalid stream.\n");
+ pa_log(__FILE__": client sent block for invalid stream.");
connection_free(c);
return;
}
@@ -1995,7 +1995,7 @@
if (pa_memblockq_push_align(ps->memblockq, chunk) < 0) {
pa_tagstruct *t;
- pa_log_warn(__FILE__": failed to push data into queue\n");
+ pa_log_warn(__FILE__": failed to push data into queue");
/* Pushing this block into the queue failed, so we simulate
* it by skipping ahead */
@@ -2050,7 +2050,7 @@
assert(p && c);
connection_free(c);
-/* pa_log(__FILE__": connection died.\n");*/
+/* pa_log(__FILE__": connection died.");*/
}
@@ -2084,7 +2084,7 @@
assert(io && p);
if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
- pa_log_warn(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_log_warn(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
pa_iochannel_free(io);
return;
}
@@ -2138,7 +2138,7 @@
p->auth_cookie_in_property = 0;
if (!fn && pa_authkey_prop_get(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0) {
- pa_log_info(__FILE__": using already loaded auth cookie.\n");
+ pa_log_info(__FILE__": using already loaded auth cookie.");
pa_authkey_prop_ref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
p->auth_cookie_in_property = 1;
return 0;
@@ -2150,7 +2150,7 @@
if (pa_authkey_load_auto(fn, p->auth_cookie, sizeof(p->auth_cookie)) < 0)
return -1;
- pa_log_info(__FILE__": loading cookie from disk.\n");
+ pa_log_info(__FILE__": loading cookie from disk.");
if (pa_authkey_prop_put(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0)
p->auth_cookie_in_property = 1;
@@ -2164,7 +2164,7 @@
assert(c && ma);
if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
- pa_log(__FILE__": public= expects a boolean argument.\n");
+ pa_log(__FILE__": public= expects a boolean argument.");
return NULL;
}
Modified: trunk/src/polypcore/protocol-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-simple.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-simple.c (original)
+++ trunk/src/polypcore/protocol-simple.c Thu Feb 23 03:27:19 2006
@@ -132,7 +132,7 @@
}
if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
- pa_log_debug(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ pa_log_debug(__FILE__": read() failed: %s", r == 0 ? "EOF" : strerror(errno));
return -1;
}
@@ -166,7 +166,7 @@
if ((r = pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->data+chunk.index, chunk.length)) < 0) {
pa_memblock_unref(chunk.memblock);
- pa_log(__FILE__": write(): %s\n", strerror(errno));
+ pa_log(__FILE__": write(): %s", strerror(errno));
return -1;
}
@@ -313,7 +313,7 @@
assert(s && io && p);
if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
- pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
+ pa_log(__FILE__": Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS);
pa_iochannel_free(io);
return;
}
@@ -342,12 +342,12 @@
size_t l;
if (!(sink = pa_namereg_get(p->core, p->sink_name, PA_NAMEREG_SINK, 1))) {
- pa_log(__FILE__": Failed to get sink.\n");
+ pa_log(__FILE__": Failed to get sink.");
goto fail;
}
if (!(c->sink_input = pa_sink_input_new(sink, __FILE__, c->client->name, &p->sample_spec, NULL, 0, -1))) {
- pa_log(__FILE__": Failed to create sink input.\n");
+ pa_log(__FILE__": Failed to create sink input.");
goto fail;
}
@@ -380,13 +380,13 @@
size_t l;
if (!(source = pa_namereg_get(p->core, p->source_name, PA_NAMEREG_SOURCE, 1))) {
- pa_log(__FILE__": Failed to get source.\n");
+ pa_log(__FILE__": Failed to get source.");
goto fail;
}
c->source_output = pa_source_output_new(source, __FILE__, c->client->name, &p->sample_spec, NULL, -1);
if (!c->source_output) {
- pa_log(__FILE__": Failed to create source output.\n");
+ pa_log(__FILE__": Failed to create source output.");
goto fail;
}
c->source_output->owner = p->module;
@@ -437,7 +437,7 @@
p->sample_spec = core->default_sample_spec;
if (pa_modargs_get_sample_spec(ma, &p->sample_spec) < 0) {
- pa_log(__FILE__": Failed to parse sample type specification.\n");
+ pa_log(__FILE__": Failed to parse sample type specification.");
goto fail;
}
@@ -446,20 +446,20 @@
enable = 0;
if (pa_modargs_get_value_boolean(ma, "record", &enable) < 0) {
- pa_log(__FILE__": record= expects a numeric argument.\n");
+ pa_log(__FILE__": record= expects a numeric argument.");
goto fail;
}
p->mode = enable ? RECORD : 0;
enable = 1;
if (pa_modargs_get_value_boolean(ma, "playback", &enable) < 0) {
- pa_log(__FILE__": playback= expects a numeric argument.\n");
+ pa_log(__FILE__": playback= expects a numeric argument.");
goto fail;
}
p->mode |= enable ? PLAYBACK : 0;
if ((p->mode & (RECORD|PLAYBACK)) == 0) {
- pa_log(__FILE__": neither playback nor recording enabled for protocol.\n");
+ pa_log(__FILE__": neither playback nor recording enabled for protocol.");
goto fail;
}
Modified: trunk/src/polypcore/pstream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pstream.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/pstream.c (original)
+++ trunk/src/polypcore/pstream.c Thu Feb 23 03:27:19 2006
@@ -246,7 +246,7 @@
if (p->dead)
return;
-/* pa_log(__FILE__": push-packet %p\n", packet); */
+/* pa_log(__FILE__": push-packet %p", packet); */
i = pa_xnew(struct item_info, 1);
i->type = PA_PSTREAM_ITEM_PACKET;
@@ -263,7 +263,7 @@
if (p->dead)
return;
-/* pa_log(__FILE__": push-memblock %p\n", chunk); */
+/* pa_log(__FILE__": push-memblock %p", chunk); */
i = pa_xnew(struct item_info, 1);
i->type = PA_PSTREAM_ITEM_MEMBLOCK;
@@ -301,7 +301,7 @@
p->write.index = 0;
if (p->write.current->type == PA_PSTREAM_ITEM_PACKET) {
- /*pa_log(__FILE__": pop-packet %p\n", p->write.current->packet);*/
+ /*pa_log(__FILE__": pop-packet %p", p->write.current->packet);*/
assert(p->write.current->packet);
p->write.data = p->write.current->packet->data;
@@ -385,7 +385,7 @@
/* Frame size too large */
if (ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) > FRAME_SIZE_MAX) {
- pa_log_warn(__FILE__": Frame size too large\n");
+ pa_log_warn(__FILE__": Frame size too large");
return -1;
}
@@ -401,7 +401,7 @@
p->read.data = p->read.memblock->data;
if (ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_SEEK]) > PA_SEEK_RELATIVE_END) {
- pa_log_warn(__FILE__": Invalid seek mode\n");
+ pa_log_warn(__FILE__": Invalid seek mode");
return -1;
}
}
Modified: trunk/src/polypcore/random.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/random.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/random.c (original)
+++ trunk/src/polypcore/random.c Thu Feb 23 03:27:19 2006
@@ -49,7 +49,7 @@
if ((fd = open(RANDOM_DEVICE, O_RDONLY)) >= 0) {
if ((r = pa_loop_read(fd, ret_data, length)) < 0 || (size_t) r != length)
- pa_log_error(__FILE__": failed to read entropy from '%s'\n", RANDOM_DEVICE);
+ pa_log_error(__FILE__": failed to read entropy from '%s'", RANDOM_DEVICE);
close(fd);
}
Modified: trunk/src/polypcore/sample-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sample-util.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/sample-util.c (original)
+++ trunk/src/polypcore/sample-util.c Thu Feb 23 03:27:19 2006
@@ -330,7 +330,7 @@
}
default:
- pa_log_error(__FILE__": ERROR: Unable to change volume of format %s.\n",
+ pa_log_error(__FILE__": ERROR: Unable to change volume of format %s.",
pa_sample_format_to_string(spec->format));
abort();
}
Modified: trunk/src/polypcore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink-input.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/sink-input.c (original)
+++ trunk/src/polypcore/sink-input.c Thu Feb 23 03:27:19 2006
@@ -57,7 +57,7 @@
assert(s->state == PA_SINK_RUNNING);
if (pa_idxset_size(s->inputs) >= PA_MAX_INPUTS_PER_SINK) {
- pa_log_warn(__FILE__": Failed to create sink input: too many inputs per sink.\n");
+ pa_log_warn(__FILE__": Failed to create sink input: too many inputs per sink.");
return NULL;
}
@@ -106,7 +106,7 @@
assert(r == 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
- pa_log_info(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"\n", i->index, i->name, s->index, st);
+ pa_log_info(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"", i->index, i->name, s->index, st);
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index);
@@ -141,7 +141,7 @@
if (i->state != PA_SINK_INPUT_DISCONNECTED)
pa_sink_input_disconnect(i);
- pa_log_info(__FILE__": freed %u \"%s\"\n", i->index, i->name);
+ pa_log_info(__FILE__": freed %u \"%s\"", i->index, i->name);
if (i->resampled_chunk.memblock)
pa_memblock_unref(i->resampled_chunk.memblock);
Modified: trunk/src/polypcore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/sink.c (original)
+++ trunk/src/polypcore/sink.c Thu Feb 23 03:27:19 2006
@@ -95,7 +95,7 @@
assert(s->index != PA_IDXSET_INVALID && r >= 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
- pa_log_info(__FILE__": created %u \"%s\" with sample spec \"%s\"\n", s->index, s->name, st);
+ pa_log_info(__FILE__": created %u \"%s\" with sample spec \"%s\"", s->index, s->name, st);
n = pa_sprintf_malloc("%s_monitor", name);
s->monitor_source = pa_source_new(core, driver, n, 0, spec, map);
@@ -143,7 +143,7 @@
if (s->state != PA_SINK_DISCONNECTED)
pa_sink_disconnect(s);
- pa_log_info(__FILE__": freed %u \"%s\"\n", s->index, s->name);
+ pa_log_info(__FILE__": freed %u \"%s\"", s->index, s->name);
pa_source_unref(s->monitor_source);
s->monitor_source = NULL;
@@ -270,7 +270,7 @@
result->memblock = pa_memblock_new(length, s->core->memblock_stat);
assert(result->memblock);
-/* pa_log("mixing %i\n", n); */
+/* pa_log("mixing %i", n); */
result->length = pa_mix(info, n, result->memblock->data, length, &s->sample_spec, &s->sw_volume);
result->index = 0;
Modified: trunk/src/polypcore/socket-client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-client.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/socket-client.c (original)
+++ trunk/src/polypcore/socket-client.c Thu Feb 23 03:27:19 2006
@@ -137,17 +137,17 @@
lerror = sizeof(error);
if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &lerror) < 0) {
- pa_log(__FILE__": getsockopt(): %s\n", strerror(errno));
+ pa_log(__FILE__": getsockopt(): %s", strerror(errno));
goto finish;
}
if (lerror != sizeof(error)) {
- pa_log(__FILE__": getsockopt() returned invalid size.\n");
+ pa_log(__FILE__": getsockopt() returned invalid size.");
goto finish;
}
if (error != 0) {
- pa_log_debug(__FILE__": connect(): %s\n", strerror(error));
+ pa_log_debug(__FILE__": connect(): %s", strerror(error));
errno = error;
goto finish;
}
@@ -188,7 +188,7 @@
if ((r = connect(c->fd, sa, len)) < 0) {
if (errno != EINPROGRESS) {
- /*pa_log(__FILE__": connect(): %s\n", strerror(errno));*/
+ /*pa_log(__FILE__": connect(): %s", strerror(errno));*/
return -1;
}
@@ -259,7 +259,7 @@
}
if ((c->fd = socket(sa->sa_family, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(): %s", strerror(errno));
return -1;
}
Modified: trunk/src/polypcore/socket-server.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-server.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/socket-server.c (original)
+++ trunk/src/polypcore/socket-server.c Thu Feb 23 03:27:19 2006
@@ -88,7 +88,7 @@
pa_socket_server_ref(s);
if ((nfd = accept(fd, NULL, NULL)) < 0) {
- pa_log(__FILE__": accept(): %s\n", strerror(errno));
+ pa_log(__FILE__": accept(): %s", strerror(errno));
goto finish;
}
@@ -107,12 +107,12 @@
request_init(&req, RQ_DAEMON, s->tcpwrap_service, RQ_FILE, nfd, NULL);
fromhost(&req);
if (!hosts_access(&req)) {
- pa_log_warn(__FILE__": TCP connection refused by tcpwrap.\n");
+ pa_log_warn(__FILE__": TCP connection refused by tcpwrap.");
close(nfd);
goto finish;
}
- pa_log_info(__FILE__": TCP connection accepted by tcpwrap.\n");
+ pa_log_info(__FILE__": TCP connection accepted by tcpwrap.");
}
#endif
@@ -167,7 +167,7 @@
assert(m && filename);
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(): %s", strerror(errno));
goto fail;
}
@@ -180,12 +180,12 @@
pa_socket_low_delay(fd);
if (bind(fd, (struct sockaddr*) &sa, SUN_LEN(&sa)) < 0) {
- pa_log(__FILE__": bind(): %s\n", strerror(errno));
+ pa_log(__FILE__": bind(): %s", strerror(errno));
goto fail;
}
if (listen(fd, 5) < 0) {
- pa_log(__FILE__": listen(): %s\n", strerror(errno));
+ pa_log(__FILE__": listen(): %s", strerror(errno));
goto fail;
}
@@ -221,14 +221,14 @@
assert(m && port);
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(PF_INET): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(PF_INET): %s", strerror(errno));
goto fail;
}
pa_fd_set_cloexec(fd, 1);
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
- pa_log(__FILE__": setsockopt(): %s\n", strerror(errno));
+ pa_log(__FILE__": setsockopt(): %s", strerror(errno));
pa_socket_tcp_low_delay(fd);
@@ -238,12 +238,12 @@
sa.sin_addr.s_addr = htonl(address);
if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
- pa_log(__FILE__": bind(): %s\n", strerror(errno));
+ pa_log(__FILE__": bind(): %s", strerror(errno));
goto fail;
}
if (listen(fd, 5) < 0) {
- pa_log(__FILE__": listen(): %s\n", strerror(errno));
+ pa_log(__FILE__": listen(): %s", strerror(errno));
goto fail;
}
@@ -270,14 +270,14 @@
assert(m && port);
if ((fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(PF_INET6): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(PF_INET6): %s", strerror(errno));
goto fail;
}
pa_fd_set_cloexec(fd, 1);
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
- pa_log(__FILE__": setsockopt(): %s\n", strerror(errno));
+ pa_log(__FILE__": setsockopt(): %s", strerror(errno));
pa_socket_tcp_low_delay(fd);
@@ -287,12 +287,12 @@
memcpy(sa.sin6_addr.s6_addr, address, 16);
if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
- pa_log(__FILE__": bind(): %s\n", strerror(errno));
+ pa_log(__FILE__": bind(): %s", strerror(errno));
goto fail;
}
if (listen(fd, 5) < 0) {
- pa_log(__FILE__": listen(): %s\n", strerror(errno));
+ pa_log(__FILE__": listen(): %s", strerror(errno));
goto fail;
}
@@ -348,7 +348,7 @@
if (inet_pton(AF_INET, name, &ipv4) > 0)
return pa_socket_server_new_ipv4(m, ntohl(ipv4), port, tcpwrap_service);
- pa_log_warn(__FILE__": failed to parse '%s'.\n", name);
+ pa_log_warn(__FILE__": failed to parse '%s'.", name);
return NULL;
}
@@ -392,7 +392,7 @@
socklen_t sa_len = sizeof(sa);
if (getsockname(s->fd, (struct sockaddr*) &sa, &sa_len) < 0) {
- pa_log(__FILE__": getsockname() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": getsockname() failed: %s", strerror(errno));
return NULL;
}
@@ -413,7 +413,7 @@
char ip[INET6_ADDRSTRLEN];
if (!inet_ntop(AF_INET6, &sa.sin6_addr, ip, sizeof(ip))) {
- pa_log(__FILE__": inet_ntop() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": inet_ntop() failed: %s", strerror(errno));
return NULL;
}
@@ -428,7 +428,7 @@
socklen_t sa_len = sizeof(sa);
if (getsockname(s->fd, (struct sockaddr*) &sa, &sa_len) < 0) {
- pa_log(__FILE__": getsockname() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": getsockname() failed: %s", strerror(errno));
return NULL;
}
@@ -448,7 +448,7 @@
char ip[INET_ADDRSTRLEN];
if (!inet_ntop(AF_INET, &sa.sin_addr, ip, sizeof(ip))) {
- pa_log(__FILE__": inet_ntop() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": inet_ntop() failed: %s", strerror(errno));
return NULL;
}
Modified: trunk/src/polypcore/socket-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-util.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/socket-util.c (original)
+++ trunk/src/polypcore/socket-util.c Thu Feb 23 03:27:19 2006
@@ -172,7 +172,7 @@
assert(fd >= 0);
/* if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&l, sizeof(l)) < 0) { */
-/* pa_log(__FILE__": SO_RCVBUF: %s\n", strerror(errno)); */
+/* pa_log(__FILE__": SO_RCVBUF: %s", strerror(errno)); */
/* return -1; */
/* } */
@@ -183,7 +183,7 @@
assert(fd >= 0);
/* if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&l, sizeof(l)) < 0) { */
-/* pa_log(__FILE__": SO_SNDBUF: %s\n", strerror(errno)); */
+/* pa_log(__FILE__": SO_SNDBUF: %s", strerror(errno)); */
/* return -1; */
/* } */
@@ -197,7 +197,7 @@
int fd = -1, ret = -1;
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(): %s", strerror(errno));
goto finish;
}
Modified: trunk/src/polypcore/sound-file-stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file-stream.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file-stream.c (original)
+++ trunk/src/polypcore/sound-file-stream.c Thu Feb 23 03:27:19 2006
@@ -131,7 +131,7 @@
memset(&sfinfo, 0, sizeof(sfinfo));
if (!(u->sndfile = sf_open(fname, SFM_READ, &sfinfo))) {
- pa_log(__FILE__": Failed to open file %s\n", fname);
+ pa_log(__FILE__": Failed to open file %s", fname);
goto fail;
}
@@ -154,7 +154,7 @@
ss.channels = sfinfo.channels;
if (!pa_sample_spec_valid(&ss)) {
- pa_log(__FILE__": Unsupported sample format in file %s\n", fname);
+ pa_log(__FILE__": Unsupported sample format in file %s", fname);
goto fail;
}
Modified: trunk/src/polypcore/sound-file.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file.c (original)
+++ trunk/src/polypcore/sound-file.c Thu Feb 23 03:27:19 2006
@@ -49,7 +49,7 @@
memset(&sfinfo, 0, sizeof(sfinfo));
if (!(sf = sf_open(fname, SFM_READ, &sfinfo))) {
- pa_log(__FILE__": Failed to open file %s\n", fname);
+ pa_log(__FILE__": Failed to open file %s", fname);
goto finish;
}
@@ -71,12 +71,12 @@
ss->channels = sfinfo.channels;
if (!pa_sample_spec_valid(ss)) {
- pa_log(__FILE__": Unsupported sample format in file %s\n", fname);
+ pa_log(__FILE__": Unsupported sample format in file %s", fname);
goto finish;
}
if ((l = pa_frame_size(ss)*sfinfo.frames) > MAX_FILE_SIZE) {
- pa_log(__FILE__": File too large\n");
+ pa_log(__FILE__": File too large");
goto finish;
}
@@ -86,7 +86,7 @@
chunk->length = l;
if (readf_function(sf, chunk->memblock->data, sfinfo.frames) != sfinfo.frames) {
- pa_log(__FILE__": Premature file end\n");
+ pa_log(__FILE__": Premature file end");
goto finish;
}
@@ -110,7 +110,7 @@
pa_sample_spec ss;
if (!(sf = sf_open(fname, SFM_READ, &sfinfo))) {
- pa_log(__FILE__": Failed to open file %s\n", fname);
+ pa_log(__FILE__": Failed to open file %s", fname);
return 0;
}
@@ -132,7 +132,7 @@
ss.channels = sfinfo.channels;
if ((pa_frame_size(&ss) * sfinfo.frames) > MAX_FILE_SIZE) {
- pa_log(__FILE__": File too large %s\n", fname);
+ pa_log(__FILE__": File too large %s", fname);
return 1;
}
Modified: trunk/src/polypcore/source-output.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source-output.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/source-output.c (original)
+++ trunk/src/polypcore/source-output.c Thu Feb 23 03:27:19 2006
@@ -53,7 +53,7 @@
assert(s->state == PA_SOURCE_RUNNING);
if (pa_idxset_size(s->outputs) >= PA_MAX_OUTPUTS_PER_SOURCE) {
- pa_log(__FILE__": Failed to create source output: too many outputs per source.\n");
+ pa_log(__FILE__": Failed to create source output: too many outputs per source.");
return NULL;
}
@@ -95,7 +95,7 @@
assert(r == 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
- pa_log_info(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"\n", o->index, o->name, s->index, st);
+ pa_log_info(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"", o->index, o->name, s->index, st);
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_NEW, o->index);
@@ -127,7 +127,7 @@
if (o->state != PA_SOURCE_OUTPUT_DISCONNECTED)
pa_source_output_disconnect(o);
- pa_log_info(__FILE__": freed %u \"%s\"\n", o->index, o->name);
+ pa_log_info(__FILE__": freed %u \"%s\"", o->index, o->name);
if (o->resampler)
pa_resampler_free(o->resampler);
Modified: trunk/src/polypcore/source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/source.c (original)
+++ trunk/src/polypcore/source.c Thu Feb 23 03:27:19 2006
@@ -91,7 +91,7 @@
assert(s->index != PA_IDXSET_INVALID && r >= 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
- pa_log_info(__FILE__": created %u \"%s\" with sample spec \"%s\"\n", s->index, s->name, st);
+ pa_log_info(__FILE__": created %u \"%s\" with sample spec \"%s\"", s->index, s->name, st);
pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_SOURCE | PA_SUBSCRIPTION_EVENT_NEW, s->index);
@@ -130,7 +130,7 @@
if (s->state != PA_SOURCE_DISCONNECTED)
pa_source_disconnect(s);
- pa_log_info(__FILE__": freed %u \"%s\"\n", s->index, s->name);
+ pa_log_info(__FILE__": freed %u \"%s\"", s->index, s->name);
pa_idxset_free(s->outputs, NULL, NULL);
Modified: trunk/src/polypcore/util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/util.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/util.c (original)
+++ trunk/src/polypcore/util.c Thu Feb 23 03:27:19 2006
@@ -120,10 +120,10 @@
u_long arg = 1;
if (ioctlsocket(fd, FIONBIO, &arg) < 0) {
if (WSAGetLastError() == WSAENOTSOCK)
- pa_log_warn(__FILE__": WARNING: Only sockets can be made non-blocking!\n");
- }
-#else
- pa_log_warn(__FILE__": WARNING: Non-blocking I/O not supported.!\n");
+ pa_log_warn(__FILE__": WARNING: Only sockets can be made non-blocking!");
+ }
+#else
+ pa_log_warn(__FILE__": WARNING: Non-blocking I/O not supported.!");
#endif
}
@@ -242,7 +242,7 @@
if (pthread_sigmask(SIG_SETMASK, NULL, &set) < 0) {
#endif
if (sigprocmask(SIG_SETMASK, NULL, &set) < 0) {
- pa_log(__FILE__": sigprocmask() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": sigprocmask() failed: %s", strerror(errno));
return;
}
#ifdef HAVE_PTHREAD
@@ -255,16 +255,16 @@
/* Check whether the signal is trapped */
if (sigaction(sig, NULL, &sa) < 0) {
- pa_log(__FILE__": sigaction() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": sigaction() failed: %s", strerror(errno));
return;
}
if (sa.sa_handler != SIG_DFL)
return;
- pa_log(__FILE__": WARNING: %s is not trapped. This might cause malfunction!\n", pa_strsignal(sig));
+ pa_log(__FILE__": WARNING: %s is not trapped. This might cause malfunction!", pa_strsignal(sig));
#else /* HAVE_SIGACTION */
- pa_log(__FILE__": WARNING: %s might not be trapped. This might cause malfunction!\n", pa_strsignal(sig));
+ pa_log(__FILE__": WARNING: %s might not be trapped. This might cause malfunction!", pa_strsignal(sig));
#endif
}
@@ -366,7 +366,7 @@
char *pa_get_host_name(char *s, size_t l) {
assert(s && l > 0);
if (gethostname(s, l) < 0) {
- pa_log(__FILE__": gethostname(): %s\n", strerror(errno));
+ pa_log(__FILE__": gethostname(): %s", strerror(errno));
return NULL;
}
s[l-1] = 0;
@@ -393,12 +393,12 @@
#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\n");
+ pa_log(__FILE__": 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\n");
+ pa_log(__FILE__": getpwuid_r() failed");
#endif
return NULL;
}
@@ -534,9 +534,9 @@
#ifdef HAVE_SYS_RESOURCE_H
if (setpriority(PRIO_PROCESS, 0, NICE_LEVEL) < 0)
- pa_log_warn(__FILE__": setpriority() failed: %s\n", strerror(errno));
+ pa_log_warn(__FILE__": setpriority() failed: %s", strerror(errno));
else
- pa_log_info(__FILE__": Successfully gained nice level %i.\n", NICE_LEVEL);
+ pa_log_info(__FILE__": Successfully gained nice level %i.", NICE_LEVEL);
#endif
#ifdef _POSIX_PRIORITY_SCHEDULING
@@ -544,25 +544,25 @@
struct sched_param sp;
if (sched_getparam(0, &sp) < 0) {
- pa_log(__FILE__": sched_getparam() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": sched_getparam() failed: %s", strerror(errno));
return;
}
sp.sched_priority = 1;
if (sched_setscheduler(0, SCHED_FIFO, &sp) < 0) {
- pa_log_warn(__FILE__": sched_setscheduler() failed: %s\n", strerror(errno));
+ pa_log_warn(__FILE__": sched_setscheduler() failed: %s", strerror(errno));
return;
}
- pa_log_info(__FILE__": Successfully enabled SCHED_FIFO scheduling.\n");
+ pa_log_info(__FILE__": Successfully enabled SCHED_FIFO scheduling.");
}
#endif
#ifdef OS_IS_WIN32
if (!SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS))
- pa_log_warn(__FILE__": SetPriorityClass() failed: 0x%08X\n", GetLastError());
+ pa_log_warn(__FILE__": SetPriorityClass() failed: 0x%08X", GetLastError());
else
- pa_log_info(__FILE__": Successfully gained high priority class.\n");
+ pa_log_info(__FILE__": Successfully gained high priority class.");
#endif
}
@@ -741,7 +741,7 @@
data = pa_xmalloc(n);
if (getgrgid_r(gid, &group, data, n, &result) < 0 || !result) {
- pa_log(__FILE__ ": getgrgid_r(%u) failed: %s\n", gid, strerror(errno));
+ pa_log(__FILE__ ": getgrgid_r(%u) failed: %s", gid, strerror(errno));
goto finish;
}
@@ -754,7 +754,7 @@
/* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X) that do not
* support getgrgid_r. */
if ((result = getgrgid(gid)) == NULL) {
- pa_log(__FILE__ ": getgrgid(%u) failed: %s\n", gid, strerror(errno));
+ pa_log(__FILE__ ": getgrgid(%u) failed: %s", gid, strerror(errno));
goto finish;
}
@@ -777,7 +777,7 @@
gids = pa_xmalloc(sizeof(GETGROUPS_T)*n);
if ((n = getgroups(n, gids)) < 0) {
- pa_log(__FILE__": getgroups() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": getgroups() failed: %s", strerror(errno));
goto finish;
}
@@ -834,7 +834,7 @@
return 0;
}
- pa_log(__FILE__": %slock failed: %s\n", !b ? "un" : "", strerror(errno));
+ pa_log(__FILE__": %slock failed: %s", !b ? "un" : "", strerror(errno));
#endif
#ifdef OS_IS_WIN32
@@ -845,7 +845,7 @@
if (!b && UnlockFile(h, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF))
return 0;
- pa_log(__FILE__": %slock failed: 0x%08X\n", !b ? "un" : "", GetLastError());
+ pa_log(__FILE__": %slock failed: 0x%08X", !b ? "un" : "", GetLastError());
#endif
return -1;
@@ -868,17 +868,17 @@
struct stat st;
if ((fd = open(fn, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) {
- pa_log(__FILE__": failed to create lock file '%s': %s\n", fn, strerror(errno));
+ pa_log(__FILE__": failed to create lock file '%s': %s", fn, strerror(errno));
goto fail;
}
if (pa_lock_fd(fd, 1) < 0) {
- pa_log(__FILE__": failed to lock file '%s'.\n", fn);
+ pa_log(__FILE__": failed to lock file '%s'.", fn);
goto fail;
}
if (fstat(fd, &st) < 0) {
- pa_log(__FILE__": failed to fstat() file '%s'.\n", fn);
+ pa_log(__FILE__": failed to fstat() file '%s'.", fn);
goto fail;
}
@@ -887,12 +887,12 @@
break;
if (pa_lock_fd(fd, 0) < 0) {
- pa_log(__FILE__": failed to unlock file '%s'.\n", fn);
+ pa_log(__FILE__": failed to unlock file '%s'.", fn);
goto fail;
}
if (close(fd) < 0) {
- pa_log(__FILE__": failed to close file '%s'.\n", fn);
+ pa_log(__FILE__": failed to close file '%s'.", fn);
goto fail;
}
@@ -915,17 +915,17 @@
assert(fn && fd >= 0);
if (unlink(fn) < 0) {
- pa_log_warn(__FILE__": WARNING: unable to remove lock file '%s': %s\n", fn, strerror(errno));
+ pa_log_warn(__FILE__": WARNING: unable to remove lock file '%s': %s", fn, strerror(errno));
r = -1;
}
if (pa_lock_fd(fd, 0) < 0) {
- pa_log_warn(__FILE__": WARNING: failed to unlock file '%s'.\n", fn);
+ pa_log_warn(__FILE__": WARNING: failed to unlock file '%s'.", fn);
r = -1;
}
if (close(fd) < 0) {
- pa_log_warn(__FILE__": WARNING: failed to close lock file '%s': %s\n", fn, strerror(errno));
+ pa_log_warn(__FILE__": WARNING: failed to close lock file '%s': %s", fn, strerror(errno));
r = -1;
}
Modified: trunk/src/polypcore/x11wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/x11wrap.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/polypcore/x11wrap.c (original)
+++ trunk/src/polypcore/x11wrap.c Thu Feb 23 03:27:19 2006
@@ -138,7 +138,7 @@
int r;
if (!(d = XOpenDisplay(name))) {
- pa_log(__FILE__": XOpenDisplay() failed\n");
+ pa_log(__FILE__": XOpenDisplay() failed");
return NULL;
}
Modified: trunk/src/utils/pacmd.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pacmd.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/utils/pacmd.c (original)
+++ trunk/src/utils/pacmd.c Thu Feb 23 03:27:19 2006
@@ -46,12 +46,12 @@
fd_set ifds, ofds;
if (pa_pid_file_check_running(&pid) < 0) {
- pa_log(__FILE__": no Polypaudio daemon running\n");
+ pa_log(__FILE__": no Polypaudio daemon running");
goto fail;
}
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
- pa_log(__FILE__": socket(PF_UNIX, SOCK_STREAM, 0): %s\n", strerror(errno));
+ pa_log(__FILE__": socket(PF_UNIX, SOCK_STREAM, 0): %s", strerror(errno));
goto fail;
}
@@ -63,7 +63,7 @@
int r;
if ((r = connect(fd, (struct sockaddr*) &sa, sizeof(sa))) < 0 && (errno != ECONNREFUSED && errno != ENOENT)) {
- pa_log(__FILE__": connect() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": connect() failed: %s", strerror(errno));
goto fail;
}
@@ -71,7 +71,7 @@
break;
if (pa_pid_file_kill(SIGUSR2, NULL) < 0) {
- pa_log(__FILE__": failed to kill Polypaudio daemon.\n");
+ pa_log(__FILE__": failed to kill Polypaudio daemon.");
goto fail;
}
@@ -79,7 +79,7 @@
}
if (i >= 5) {
- pa_log(__FILE__": daemon not responding.\n");
+ pa_log(__FILE__": daemon not responding.");
goto fail;
}
@@ -94,7 +94,7 @@
for (;;) {
if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) {
- pa_log(__FILE__": select() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": select() failed: %s", strerror(errno));
goto fail;
}
@@ -106,7 +106,7 @@
if (r == 0)
break;
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
goto fail;
}
@@ -122,7 +122,7 @@
if (r == 0)
break;
- pa_log(__FILE__": read() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": read() failed: %s", strerror(errno));
goto fail;
}
@@ -135,7 +135,7 @@
assert(obuf_length);
if ((r = write(1, obuf + obuf_index, obuf_length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
goto fail;
}
@@ -149,7 +149,7 @@
assert(ibuf_length);
if ((r = write(fd, ibuf + ibuf_index, ibuf_length)) < 0) {
- pa_log(__FILE__": write() failed: %s\n", strerror(errno));
+ pa_log(__FILE__": write() failed: %s", strerror(errno));
goto fail;
}
Modified: trunk/src/utils/pax11publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pax11publish.c?rev=574&root=polypaudio&r1=573&r2=574&view=diff
==============================================================================
--- trunk/src/utils/pax11publish.c (original)
+++ trunk/src/utils/pax11publish.c Thu Feb 23 03:27:19 2006
@@ -90,7 +90,7 @@
}
if (!(d = XOpenDisplay(dname))) {
- pa_log(__FILE__": XOpenDisplay() failed\n");
+ pa_log(__FILE__": XOpenDisplay() failed");
goto finish;
}
More information about the pulseaudio-commits
mailing list