properly copy error string

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1947 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index 49943fa49640df2daee28ad23e1c0dc783b09d2d..5019d6564dbb04a0ebf654fa62d478510cd3acee 100644 (file)
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -244,7 +244,7 @@ finish:
 static void jack_error_func(const char*t) {
     char *s;
 
-    s = pa_xstrndup(s, strcspn(s, "\n\r"));
+    s = pa_xstrndup(t, strcspn(t, "\n\r"));
     pa_log_warn("JACK error >%s<", s);
     pa_xfree(s);
 }

diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index d0124cffb3a2e141b2f41d4bebe8cf4703c5a52a..b62ebe7a1b49fe2c8a617886e1fc11c1a7abece2 100644 (file)
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
@@ -221,7 +220,7 @@ finish:
 static void jack_error_func(const char*t) {
     char *s;
 
-    s = pa_xstrndup(s, strcspn(s, "\n\r"));
+    s = pa_xstrndup(t, strcspn(t, "\n\r"));
     pa_log_warn("JACK error >%s<", s);
     pa_xfree(s);
 }
@@ -255,7 +254,7 @@ int pa__init(pa_module*m) {
     const char **ports = NULL, **p;
     char *t;
 
-    assert(m);
+    pa_assert(m);
 
     jack_set_error_function(jack_error_func);
 
@@ -277,6 +276,7 @@ int pa__init(pa_module*m) {
     u->module = m;
     m->userdata = u;
     u->saved_frame_time_valid = FALSE;
+
     pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
     u->rtpoll = pa_rtpoll_new();
     pa_rtpoll_item_new_asyncmsgq(u->rtpoll, PA_RTPOLL_EARLY, u->thread_mq.inq);
@@ -315,7 +315,7 @@ int pa__init(pa_module*m) {
     ss.rate = jack_get_sample_rate(u->client);
     ss.format = PA_SAMPLE_FLOAT32NE;
 
-    assert(pa_sample_spec_valid(&ss));
+    pa_assert(pa_sample_spec_valid(&ss));
 
     for (i = 0; i < ss.channels; i++) {
         if (!(u->port[i] = jack_port_register(u->client, pa_channel_position_to_string(map.map[i]), JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput|JackPortIsTerminal, 0))) {
@@ -391,7 +391,7 @@ fail:
 
 void pa__done(pa_module*m) {
     struct userdata *u;
-    assert(m);
+    pa_assert(m);
 
     if (!(u = m->userdata))
         return;