summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-03-02 16:28:08 +0100
committerLennart Poettering <lennart@poettering.net>2009-03-02 16:28:08 +0100
commit7794108d177fd5c7e9485af6061c8188fa31c4e4 (patch)
treec8708f4ff83338f995ee8eb4c8b4ed5966eaf0f1 /src
parent45ae4abe2389355b8b84cb1fa1f46038b22e2f9a (diff)
parentc08317772b9478039b2837f4fe02f9dda4231241 (diff)
Merge commit 'coling/master'
Diffstat (limited to 'src')
-rw-r--r--src/modules/module-combine.c2
-rw-r--r--src/modules/module-jack-source.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 6ed4f141..6e4e9277 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -487,7 +487,7 @@ static void sink_input_kill_cb(pa_sink_input *i) {
struct output *o;
pa_sink_input_assert_ref(i);
- pa_assert(o = i->userdata);
+ pa_assert_se(o = i->userdata);
pa_module_unload_request(o->userdata->module, TRUE);
output_free(o);
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index 38b63751..373d56e2 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -163,7 +163,7 @@ static int jack_process(jack_nframes_t nframes, void *arg) {
pa_assert(u);
for (c = 0; c < u->channels; c++)
- pa_assert(buffer[c] = jack_port_get_buffer(u->port[c], nframes));
+ pa_assert_se(buffer[c] = jack_port_get_buffer(u->port[c], nframes));
/* We interleave the data and pass it on to the other RT thread */