diff options
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/bt-proximity-helper.c | 38 | ||||
-rw-r--r-- | src/modules/module-ladspa-sink.c | 3 | ||||
-rw-r--r-- | src/modules/module-protocol-stub.c | 5 | ||||
-rw-r--r-- | src/modules/module-tunnel.c | 4 |
4 files changed, 22 insertions, 28 deletions
diff --git a/src/modules/bt-proximity-helper.c b/src/modules/bt-proximity-helper.c index d80cc0c1..5f042c37 100644 --- a/src/modules/bt-proximity-helper.c +++ b/src/modules/bt-proximity-helper.c @@ -1,35 +1,29 @@ /* $Id$ */ -/*** - This file is part of PulseAudio. - - Copyright 2007 Lennart Poettering - - 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, - or (at your option) any later version. - - PulseAudio is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - /* * Small SUID helper that allows us to ping a BT device. Borrows - * heavily from bluez-utils' l2ping, which is licensed as GPL2+, too + * heavily from bluez-utils' l2ping, which is licensed as GPL2+ * and comes with a copyright like this: * * Copyright (C) 2000-2001 Qualcomm Incorporated * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com> * Copyright (C) 2002-2007 Marcel Holtmann <marcel@holtmann.org> * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * */ #ifdef HAVE_CONFIG_H diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c index 696b6ea6..1ba2b48a 100644 --- a/src/modules/module-ladspa-sink.c +++ b/src/modules/module-ladspa-sink.c @@ -484,8 +484,7 @@ int pa__init(pa_module*m) { if (p > n_control || k) { pa_log("Too many control values passed, %lu expected.", n_control); - if (k) - pa_xfree(k); + pa_xfree(k); goto fail; } diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index a9bd850b..600201b4 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -218,7 +218,7 @@ int pa__init(pa_module*m) { char tmp[PATH_MAX]; #if defined(USE_PROTOCOL_ESOUND) -#if defined(USE_PERUSER_ESOUND_SOCKET) +#if defined(USE_PER_USER_ESOUND_SOCKET) char esdsocketpath[PATH_MAX]; #else const char esdsocketpath[] = "/tmp/.esd/socket"; @@ -269,9 +269,10 @@ int pa__init(pa_module*m) { #if defined(USE_PROTOCOL_ESOUND) -#if defined(USE_PERUSER_ESOUND_SOCKET) +#if defined(USE_PER_USER_ESOUND_SOCKET) snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid()); #endif + pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp)); u->socket_path = pa_xstrdup(tmp); diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index 2da2d134..5483be39 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -723,7 +723,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint3 goto fail; } - if (strcmp(name, u->sink_name)) + if (!u->sink_name || strcmp(name, u->sink_name)) return; pa_xfree(u->device_description); @@ -836,7 +836,7 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uin goto fail; } - if (strcmp(name, u->source_name)) + if (!u->source_name || strcmp(name, u->source_name)) return; pa_xfree(u->device_description); |