trivial: Use @self for instance data

1 files changed, 51 insertions, 51 deletions

diff --git a/gusb/gusb-interface.c b/gusb/gusb-interface.c
index 086580a..b08defa 100644
--- a/gusb/gusb-interface.c
+++ b/gusb/gusb-interface.c
@@ -37,10 +37,10 @@ G_DEFINE_TYPE(GUsbInterface, g_usb_interface, G_TYPE_OBJECT)
 static void
 g_usb_interface_finalize(GObject *object)
 {
-	GUsbInterface *interface = G_USB_INTERFACE(object);
+	GUsbInterface *self = G_USB_INTERFACE(object);
 
-	g_bytes_unref(interface->extra);
-	g_ptr_array_unref(interface->endpoints);
+	g_bytes_unref(self->extra);
+	g_ptr_array_unref(self->endpoints);
 
 	G_OBJECT_CLASS(g_usb_interface_parent_class)->finalize(object);
 }
@@ -54,7 +54,7 @@ g_usb_interface_class_init(GUsbInterfaceClass *klass)
 }
 
 static void
-g_usb_interface_init(GUsbInterface *interface)
+g_usb_interface_init(GUsbInterface *self)
 {
 }
 
@@ -68,23 +68,23 @@ g_usb_interface_init(GUsbInterface *interface)
 GUsbInterface *
 _g_usb_interface_new(const struct libusb_interface_descriptor *iface)
 {
-	GUsbInterface *interface;
-	interface = g_object_new(G_USB_TYPE_INTERFACE, NULL);
+	GUsbInterface *self;
+	self = g_object_new(G_USB_TYPE_INTERFACE, NULL);
 
 	/* copy the data */
-	memcpy(&interface->iface, iface, sizeof(struct libusb_interface_descriptor));
-	interface->extra = g_bytes_new(iface->extra, iface->extra_length);
+	memcpy(&self->iface, iface, sizeof(struct libusb_interface_descriptor));
+	self->extra = g_bytes_new(iface->extra, iface->extra_length);
 
-	interface->endpoints = g_ptr_array_new_with_free_func(g_object_unref);
+	self->endpoints = g_ptr_array_new_with_free_func(g_object_unref);
 	for (guint i = 0; i < iface->bNumEndpoints; i++)
-		g_ptr_array_add(interface->endpoints, _g_usb_endpoint_new(&iface->endpoint[i]));
+		g_ptr_array_add(self->endpoints, _g_usb_endpoint_new(&iface->endpoint[i]));
 
-	return G_USB_INTERFACE(interface);
+	return G_USB_INTERFACE(self);
 }
 
 /**
  * g_usb_interface_get_length:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the USB bus number for the interface.
  *
@@ -93,15 +93,15 @@ _g_usb_interface_new(const struct libusb_interface_descriptor *iface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_length(GUsbInterface *interface)
+g_usb_interface_get_length(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bLength;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bLength;
 }
 
 /**
  * g_usb_interface_get_kind:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the type of interface.
  *
@@ -110,15 +110,15 @@ g_usb_interface_get_length(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_kind(GUsbInterface *interface)
+g_usb_interface_get_kind(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bDescriptorType;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bDescriptorType;
 }
 
 /**
  * g_usb_interface_get_number:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the interface number.
  *
@@ -127,15 +127,15 @@ g_usb_interface_get_kind(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_number(GUsbInterface *interface)
+g_usb_interface_get_number(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bInterfaceNumber;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bInterfaceNumber;
 }
 
 /**
  * g_usb_interface_get_alternate:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the alternate setting for the interface.
  *
@@ -144,15 +144,15 @@ g_usb_interface_get_number(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_alternate(GUsbInterface *interface)
+g_usb_interface_get_alternate(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bAlternateSetting;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bAlternateSetting;
 }
 
 /**
  * g_usb_interface_get_class:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the interface class, typically a #GUsbInterfaceClassCode.
  *
@@ -161,15 +161,15 @@ g_usb_interface_get_alternate(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_class(GUsbInterface *interface)
+g_usb_interface_get_class(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bInterfaceClass;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bInterfaceClass;
 }
 
 /**
  * g_usb_interface_get_subclass:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the interface subclass qualified by the class number.
  * See g_usb_interface_get_class().
@@ -179,15 +179,15 @@ g_usb_interface_get_class(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_subclass(GUsbInterface *interface)
+g_usb_interface_get_subclass(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bInterfaceSubClass;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bInterfaceSubClass;
 }
 
 /**
  * g_usb_interface_get_protocol:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the interface protocol qualified by the class and subclass numbers.
  * See g_usb_interface_get_class() and g_usb_interface_get_subclass().
@@ -197,15 +197,15 @@ g_usb_interface_get_subclass(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_protocol(GUsbInterface *interface)
+g_usb_interface_get_protocol(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.bInterfaceProtocol;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.bInterfaceProtocol;
 }
 
 /**
  * g_usb_interface_get_index:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets the index for the string descriptor.
  *
@@ -214,15 +214,15 @@ g_usb_interface_get_protocol(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 guint8
-g_usb_interface_get_index(GUsbInterface *interface)
+g_usb_interface_get_index(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), 0);
-	return interface->iface.iInterface;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), 0);
+	return self->iface.iInterface;
 }
 
 /**
  * g_usb_interface_get_extra:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets any extra data from the interface.
  *
@@ -231,15 +231,15 @@ g_usb_interface_get_index(GUsbInterface *interface)
  * Since: 0.2.8
  **/
 GBytes *
-g_usb_interface_get_extra(GUsbInterface *interface)
+g_usb_interface_get_extra(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), NULL);
-	return interface->extra;
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), NULL);
+	return self->extra;
 }
 
 /**
  * g_usb_interface_get_endpoints:
- * @interface: a #GUsbInterface
+ * @self: a #GUsbInterface
  *
  * Gets interface endpoints.
  *
@@ -249,8 +249,8 @@ g_usb_interface_get_extra(GUsbInterface *interface)
  * Since: 0.3.3
  **/
 GPtrArray *
-g_usb_interface_get_endpoints(GUsbInterface *interface)
+g_usb_interface_get_endpoints(GUsbInterface *self)
 {
-	g_return_val_if_fail(G_USB_IS_INTERFACE(interface), NULL);
-	return g_ptr_array_ref(interface->endpoints);
+	g_return_val_if_fail(G_USB_IS_INTERFACE(self), NULL);
+	return g_ptr_array_ref(self->endpoints);
 }