From 4a64b0d1167e980d81b798d813f35209895f0674 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Feb 2006 02:27:19 +0000
Subject: change pa_log() and friends to not require a trailing \n on all
 logged strings

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/module-solaris.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/modules/module-solaris.c')

diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 7356cb7b..1de21aed 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -150,7 +150,7 @@ static void do_write(struct userdata *u) {
         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 @@ static void do_write(struct userdata *u) {
      * 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 @@ static void do_read(struct userdata *u) {
     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 @@ static int sink_set_hw_volume_cb(pa_sink *s) {
 
     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 @@ static int pa_solaris_auto_format(int fd, int mode, pa_sample_spec *ss) {
 
     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 @@ static int pa_solaris_set_buffer(int fd, int buffer_size) {
 
     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 @@ int pa__init(pa_core *c, pa_module*m) {
     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 @@ int pa__init(pa_core *c, pa_module*m) {
 
     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;
-- 
cgit