- Fix a couple of warnings in the CUPS/BlueZ 4.x patch

This commit is contained in:
Bastien Nocera 2009-03-14 00:42:09 +00:00
parent f777da2c45
commit f70df65f68
2 changed files with 6 additions and 3 deletions

View File

@ -122,7 +122,7 @@ index d8b899e..002c96a 100644
const char *hcr_print = "00001126-0000-1000-8000-00805f9b34fb"; const char *hcr_print = "00001126-0000-1000-8000-00805f9b34fb";
- char *xml, *id; - char *xml, *id;
+ const char *xml; + const char *xml;
+ char *id; + char *id = NULL;
/* Look for the service handle of the HCRP service */ /* Look for the service handle of the HCRP service */
- message = dbus_message_new_method_call("org.bluez", adapter, - message = dbus_message_new_method_call("org.bluez", adapter,
@ -152,7 +152,7 @@ index d8b899e..002c96a 100644
- dbus_message_iter_next(&iter_array); - dbus_message_iter_next(&iter_array);
+ if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) { + if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY) {
+ dbus_message_unref(reply); + dbus_message_unref(reply);
+ return FALSE; + return NULL;
} }
- dbus_message_unref(reply); - dbus_message_unref(reply);

View File

@ -1,7 +1,7 @@
Summary: Bluetooth utilities Summary: Bluetooth utilities
Name: bluez Name: bluez
Version: 4.32 Version: 4.32
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@ -203,6 +203,9 @@ fi
%{_libdir}/alsa-lib/*.so %{_libdir}/alsa-lib/*.so
%changelog %changelog
* Sat Mar 14 2009 - Bastien Nocera <bnocera@redhat.com> - 4.32-10
- Fix a couple of warnings in the CUPS/BlueZ 4.x patch
* Fri Mar 13 2009 - Bastien Nocera <bnocera@redhat.com> - 4.32-9 * Fri Mar 13 2009 - Bastien Nocera <bnocera@redhat.com> - 4.32-9
- Switch Wacom Bluetooth tablet to mode 2 - Switch Wacom Bluetooth tablet to mode 2