mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Get rid of warnings about unused stuff when building against a D-Bus version that doesn't have fd-passing support.

Browse source
This commit is contained in:
Tanu Kaskinen 2011-03-21 15:08:35 +02:00 • committed by Colin Guthrie
parent 51163d0fd9
commit 99e37b6003
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/bluetooth/bluetooth-util.c
View file

@ -519,6 +519,7 @@ static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_discovery *y, DBusM
return p; return p;
} }
#ifdef DBUS_TYPE_UNIX_FD
static void register_endpoint_reply(DBusPendingCall *pending, void *userdata) { static void register_endpoint_reply(DBusPendingCall *pending, void *userdata) {
DBusError e; DBusError e;
DBusMessage *r; DBusMessage *r;
@ -559,6 +560,7 @@ finish:
pa_xfree(endpoint); pa_xfree(endpoint);
} }
#endif
static void list_devices_reply(DBusPendingCall *pending, void *userdata) { static void list_devices_reply(DBusPendingCall *pending, void *userdata) {
DBusError e; DBusError e;
@ -607,6 +609,7 @@ finish:
pa_dbus_pending_free(p); pa_dbus_pending_free(p);
} }
#ifdef DBUS_TYPE_UNIX_FD
static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const char *endpoint, const char *uuid) { static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const char *endpoint, const char *uuid) {
DBusMessage *m; DBusMessage *m;
DBusMessageIter i, d; DBusMessageIter i, d;
@ -654,6 +657,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
send_and_add_to_pending(y, m, register_endpoint_reply, pa_xstrdup(endpoint)); send_and_add_to_pending(y, m, register_endpoint_reply, pa_xstrdup(endpoint));
} }
#endif
static void found_adapter(pa_bluetooth_discovery *y, const char *path) { static void found_adapter(pa_bluetooth_discovery *y, const char *path) {
DBusMessage *m; DBusMessage *m;
@ -1042,7 +1046,9 @@ int pa_bluetooth_transport_acquire(const pa_bluetooth_transport *t, const char *
if (omtu) if (omtu)
*omtu = o; *omtu = o;
#ifdef DBUS_TYPE_UNIX_FD
fail: fail:
#endif
dbus_message_unref(r); dbus_message_unref(r);
return ret; return ret;
} }
@ -1083,6 +1089,7 @@ static int setup_dbus(pa_bluetooth_discovery *y) {
return 0; return 0;
} }
#ifdef DBUS_TYPE_UNIX_FD
static pa_bluetooth_transport *transport_new(pa_bluetooth_discovery *y, const char *path, enum profile p, const uint8_t *config, int size) { static pa_bluetooth_transport *transport_new(pa_bluetooth_discovery *y, const char *path, enum profile p, const uint8_t *config, int size) {
pa_bluetooth_transport *t; pa_bluetooth_transport *t;
@ -1435,13 +1442,16 @@ static DBusHandlerResult endpoint_handler(DBusConnection *c, DBusMessage *m, voi
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_HANDLED;
} }
#endif /* DBUS_TYPE_UNIX_FD */
pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) { pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
DBusError err; DBusError err;
pa_bluetooth_discovery *y; pa_bluetooth_discovery *y;
#ifdef DBUS_TYPE_UNIX_FD
static const DBusObjectPathVTable vtable_endpoint = { static const DBusObjectPathVTable vtable_endpoint = {
.message_function = endpoint_handler, .message_function = endpoint_handler,
}; };
#endif
pa_assert(c); pa_assert(c);