1 files changed, 80 insertions, 93 deletions

diff --git a/gusb/gusb-device-list.c b/gusb/gusb-device-list.c
index c350934..1ca9a20 100644
--- a/gusb/gusb-device-list.c
+++ b/gusb/gusb-device-list.c
@@ -15,109 +15,99 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <libusb.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "gusb-context-private.h"
 #include "gusb-device-list.h"
 #include "gusb-device-private.h"
 
-enum {
-	PROP_0,
-	PROP_CONTEXT
-};
+enum { PROP_0, PROP_CONTEXT };
 
-enum
-{
-	DEVICE_ADDED_SIGNAL,
-	DEVICE_REMOVED_SIGNAL,
-	LAST_SIGNAL
-};
+enum { DEVICE_ADDED_SIGNAL, DEVICE_REMOVED_SIGNAL, LAST_SIGNAL };
 
 struct _GUsbDeviceListPrivate {
 	GUsbContext *context;
 };
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = {0};
 
-G_DEFINE_TYPE_WITH_PRIVATE (GUsbDeviceList, g_usb_device_list, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE(GUsbDeviceList, g_usb_device_list, G_TYPE_OBJECT);
 
 static void
-g_usb_device_list_get_property (GObject    *object,
-				guint       prop_id,
-				GValue     *value,
-				GParamSpec *pspec)
+g_usb_device_list_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	GUsbDeviceList *list = G_USB_DEVICE_LIST (object);
+	GUsbDeviceList *list = G_USB_DEVICE_LIST(object);
 	GUsbDeviceListPrivate *priv = list->priv;
 
 	switch (prop_id) {
 	case PROP_CONTEXT:
-		g_value_set_object (value, priv->context);
+		g_value_set_object(value, priv->context);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 		break;
 	}
 }
 
 static void
-g_usb_device_added_cb (GUsbContext    *context,
-		       GUsbDevice     *device,
-		       GUsbDeviceList *list)
+g_usb_device_added_cb(GUsbContext *context, GUsbDevice *device, GUsbDeviceList *list)
 {
-	g_signal_emit (list, signals[DEVICE_ADDED_SIGNAL], 0, device);
+	g_signal_emit(list, signals[DEVICE_ADDED_SIGNAL], 0, device);
 }
 
 static void
-g_usb_device_removed_cb (GUsbContext    *context,
-			 GUsbDevice     *device,
-			 GUsbDeviceList *list)
+g_usb_device_removed_cb(GUsbContext *context, GUsbDevice *device, GUsbDeviceList *list)
 {
-	g_signal_emit (list, signals[DEVICE_REMOVED_SIGNAL], 0, device);
+	g_signal_emit(list, signals[DEVICE_REMOVED_SIGNAL], 0, device);
 }
 
 static void
-g_usb_device_list_set_property (GObject      *object,
-				guint	 prop_id,
-				const GValue *value,
-				GParamSpec   *pspec)
+g_usb_device_list_set_property(GObject *object,
+			       guint prop_id,
+			       const GValue *value,
+			       GParamSpec *pspec)
 {
-	GUsbDeviceList *list = G_USB_DEVICE_LIST (object);
+	GUsbDeviceList *list = G_USB_DEVICE_LIST(object);
 	GUsbDeviceListPrivate *priv = list->priv;
 
 	switch (prop_id) {
 	case PROP_CONTEXT:
-		priv->context = g_value_get_object (value);
-		g_signal_connect (priv->context, "device-added",
-				  G_CALLBACK (g_usb_device_added_cb), list);
-		g_signal_connect (priv->context, "device-removed",
-				  G_CALLBACK (g_usb_device_removed_cb), list);
+		priv->context = g_value_get_object(value);
+		g_signal_connect(priv->context,
+				 "device-added",
+				 G_CALLBACK(g_usb_device_added_cb),
+				 list);
+		g_signal_connect(priv->context,
+				 "device-removed",
+				 G_CALLBACK(g_usb_device_removed_cb),
+				 list);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 		break;
 	}
 }
 
 static void
-g_usb_device_list_class_init (GUsbDeviceListClass *klass)
+g_usb_device_list_class_init(GUsbDeviceListClass *klass)
 {
 	GParamSpec *pspec;
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-	object_class->get_property	= g_usb_device_list_get_property;
-	object_class->set_property	= g_usb_device_list_set_property;
+	object_class->get_property = g_usb_device_list_get_property;
+	object_class->set_property = g_usb_device_list_set_property;
 
 	/**
 	 * GUsbDeviceList:context:
 	 */
-	pspec = g_param_spec_object ("context", NULL, NULL,
-				     G_USB_TYPE_CONTEXT,
-				     G_PARAM_CONSTRUCT_ONLY|
-				     G_PARAM_READWRITE);
-	g_object_class_install_property (object_class, PROP_CONTEXT, pspec);
+	pspec = g_param_spec_object("context",
+				    NULL,
+				    NULL,
+				    G_USB_TYPE_CONTEXT,
+				    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+	g_object_class_install_property(object_class, PROP_CONTEXT, pspec);
 
 	/**
 	 * GUsbDeviceList::device-added:
@@ -126,16 +116,17 @@ g_usb_device_list_class_init (GUsbDeviceListClass *klass)
 	 *
 	 * This signal is emitted when a USB device is added.
 	 **/
-	signals[DEVICE_ADDED_SIGNAL] = g_signal_new ("device-added",
-			G_TYPE_FROM_CLASS (klass),
-			G_SIGNAL_RUN_LAST,
-			G_STRUCT_OFFSET (GUsbDeviceListClass, device_added),
-			NULL,
-			NULL,
-			g_cclosure_marshal_VOID__OBJECT,
-			G_TYPE_NONE,
-			1,
-			G_USB_TYPE_DEVICE);
+	signals[DEVICE_ADDED_SIGNAL] =
+	    g_signal_new("device-added",
+			 G_TYPE_FROM_CLASS(klass),
+			 G_SIGNAL_RUN_LAST,
+			 G_STRUCT_OFFSET(GUsbDeviceListClass, device_added),
+			 NULL,
+			 NULL,
+			 g_cclosure_marshal_VOID__OBJECT,
+			 G_TYPE_NONE,
+			 1,
+			 G_USB_TYPE_DEVICE);
 
 	/**
 	 * GUsbDeviceList::device-removed:
@@ -144,22 +135,23 @@ g_usb_device_list_class_init (GUsbDeviceListClass *klass)
 	 *
 	 * This signal is emitted when a USB device is removed.
 	 **/
-	signals[DEVICE_REMOVED_SIGNAL] = g_signal_new ("device-removed",
-			G_TYPE_FROM_CLASS (klass),
-			G_SIGNAL_RUN_LAST,
-			G_STRUCT_OFFSET (GUsbDeviceListClass, device_removed),
-			NULL,
-			NULL,
-			g_cclosure_marshal_VOID__OBJECT,
-			G_TYPE_NONE,
-			1,
-			G_USB_TYPE_DEVICE);
+	signals[DEVICE_REMOVED_SIGNAL] =
+	    g_signal_new("device-removed",
+			 G_TYPE_FROM_CLASS(klass),
+			 G_SIGNAL_RUN_LAST,
+			 G_STRUCT_OFFSET(GUsbDeviceListClass, device_removed),
+			 NULL,
+			 NULL,
+			 g_cclosure_marshal_VOID__OBJECT,
+			 G_TYPE_NONE,
+			 1,
+			 G_USB_TYPE_DEVICE);
 }
 
 static void
-g_usb_device_list_init (GUsbDeviceList *list)
+g_usb_device_list_init(GUsbDeviceList *list)
 {
-	list->priv = g_usb_device_list_get_instance_private (list);
+	list->priv = g_usb_device_list_get_instance_private(list);
 }
 
 /**
@@ -171,11 +163,11 @@ g_usb_device_list_init (GUsbDeviceList *list)
  * Since: 0.1.0
  **/
 GPtrArray *
-g_usb_device_list_get_devices (GUsbDeviceList *list)
+g_usb_device_list_get_devices(GUsbDeviceList *list)
 {
-	g_return_val_if_fail (G_USB_IS_DEVICE_LIST (list), NULL);
+	g_return_val_if_fail(G_USB_IS_DEVICE_LIST(list), NULL);
 
-	return g_usb_context_get_devices (list->priv->context);
+	return g_usb_context_get_devices(list->priv->context);
 }
 
 /**
@@ -187,7 +179,7 @@ g_usb_device_list_get_devices (GUsbDeviceList *list)
  * Since: 0.1.0
  **/
 void
-g_usb_device_list_coldplug (GUsbDeviceList *list)
+g_usb_device_list_coldplug(GUsbDeviceList *list)
 {
 	return;
 }
@@ -206,16 +198,15 @@ g_usb_device_list_coldplug (GUsbDeviceList *list)
  * Since: 0.1.0
  **/
 GUsbDevice *
-g_usb_device_list_find_by_bus_address (GUsbDeviceList  *list,
-				       guint8	   bus,
-				       guint8	   address,
-				       GError	 **error)
+g_usb_device_list_find_by_bus_address(GUsbDeviceList *list,
+				      guint8 bus,
+				      guint8 address,
+				      GError **error)
 {
-	g_return_val_if_fail (G_USB_IS_DEVICE_LIST (list), NULL);
-	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+	g_return_val_if_fail(G_USB_IS_DEVICE_LIST(list), NULL);
+	g_return_val_if_fail(error == NULL || *error == NULL, NULL);
 
-	return g_usb_context_find_by_bus_address (list->priv->context,
-						  bus, address, error);
+	return g_usb_context_find_by_bus_address(list->priv->context, bus, address, error);
 }
 
 /**
@@ -232,16 +223,12 @@ g_usb_device_list_find_by_bus_address (GUsbDeviceList  *list,
  * Since: 0.1.0
  **/
 GUsbDevice *
-g_usb_device_list_find_by_vid_pid (GUsbDeviceList  *list,
-				   guint16	  vid,
-				   guint16	  pid,
-				   GError	 **error)
+g_usb_device_list_find_by_vid_pid(GUsbDeviceList *list, guint16 vid, guint16 pid, GError **error)
 {
-	g_return_val_if_fail (G_USB_IS_DEVICE_LIST (list), NULL);
-	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+	g_return_val_if_fail(G_USB_IS_DEVICE_LIST(list), NULL);
+	g_return_val_if_fail(error == NULL || *error == NULL, NULL);
 
-	return g_usb_context_find_by_vid_pid (list->priv->context,
-					      vid, pid, error);
+	return g_usb_context_find_by_vid_pid(list->priv->context, vid, pid, error);
 }
 
 /**
@@ -258,7 +245,7 @@ g_usb_device_list_find_by_vid_pid (GUsbDeviceList  *list,
  * Since: 0.1.0
  **/
 GUsbDeviceList *
-g_usb_device_list_new (GUsbContext *context)
+g_usb_device_list_new(GUsbContext *context)
 {
-	return g_object_new (G_USB_TYPE_DEVICE_LIST, "context", context, NULL);
+	return g_object_new(G_USB_TYPE_DEVICE_LIST, "context", context, NULL);
 }