From c08317772b9478039b2837f4fe02f9dda4231241 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Mar 2009 13:11:29 +0000 Subject: Use pa_assert_se() when the containing code has side effects. As reported by rantala. Closes #502 and #503 --- src/modules/module-combine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/module-combine.c') 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); -- cgit From 86dee05aec330a0c2886c0327712153793ca46c4 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 3 Mar 2009 20:23:02 +0000 Subject: Use LGPL 2.1 on all files previously using LGPL 2 --- src/modules/module-combine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/module-combine.c') diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 6e4e9277..4b2d6f9b 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -5,7 +5,7 @@ PulseAudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. PulseAudio is distributed in the hope that it will be useful, but -- cgit