diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-03-02 13:11:29 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-03-02 13:11:29 +0000 |
| commit | c08317772b9478039b2837f4fe02f9dda4231241 (patch) | |
| tree | ea5340f6ef1c8254c41bcd15adfbfd485fe47dda | |
| parent | 8a00c009439d1c559a2992b2f9f67e2708334d5a (diff) | |
Use pa_assert_se() when the containing code has side effects.
As reported by rantala. Closes #502 and #503
| -rw-r--r-- | src/modules/module-combine.c | 2 | ||||
| -rw-r--r-- | src/modules/module-jack-source.c | 2 |
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 */ |