From 6eb6e9d8bb45042b1e5d0acc058169d2eaf2deeb Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Sun, 14 Aug 2022 17:19:20 +0100 Subject: trivial: Use @self for instance data --- gusb/gusb-endpoint.c | 89 ++++++++++++++++++++++--------------------- gusb/gusb-endpoint.h | 18 ++++----- gusb/gusb-interface.c | 102 +++++++++++++++++++++++++------------------------- gusb/gusb-interface.h | 20 +++++----- 4 files changed, 114 insertions(+), 115 deletions(-) diff --git a/gusb/gusb-endpoint.c b/gusb/gusb-endpoint.c index ce2b298..fcf86cf 100644 --- a/gusb/gusb-endpoint.c +++ b/gusb/gusb-endpoint.c @@ -33,9 +33,9 @@ G_DEFINE_TYPE(GUsbEndpoint, g_usb_endpoint, G_TYPE_OBJECT) static void g_usb_endpoint_finalize(GObject *object) { - GUsbEndpoint *endpoint = G_USB_ENDPOINT(object); + GUsbEndpoint *self = G_USB_ENDPOINT(object); - g_bytes_unref(endpoint->extra); + g_bytes_unref(self->extra); G_OBJECT_CLASS(g_usb_endpoint_parent_class)->finalize(object); } @@ -49,7 +49,7 @@ g_usb_endpoint_class_init(GUsbEndpointClass *klass) } static void -g_usb_endpoint_init(GUsbEndpoint *endpoint) +g_usb_endpoint_init(GUsbEndpoint *self) { } @@ -63,22 +63,21 @@ g_usb_endpoint_init(GUsbEndpoint *endpoint) GUsbEndpoint * _g_usb_endpoint_new(const struct libusb_endpoint_descriptor *endpoint_descriptor) { - GUsbEndpoint *endpoint; - endpoint = g_object_new(G_USB_TYPE_ENDPOINT, NULL); + GUsbEndpoint *self; + self = g_object_new(G_USB_TYPE_ENDPOINT, NULL); /* copy the data */ - memcpy(&endpoint->endpoint_descriptor, + memcpy(&self->endpoint_descriptor, endpoint_descriptor, sizeof(struct libusb_endpoint_descriptor)); - endpoint->extra = - g_bytes_new(endpoint_descriptor->extra, endpoint_descriptor->extra_length); + self->extra = g_bytes_new(endpoint_descriptor->extra, endpoint_descriptor->extra_length); - return G_USB_ENDPOINT(endpoint); + return G_USB_ENDPOINT(self); } /** * g_usb_endpoint_get_kind: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the type of endpoint. * @@ -87,15 +86,15 @@ _g_usb_endpoint_new(const struct libusb_endpoint_descriptor *endpoint_descriptor * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_kind(GUsbEndpoint *endpoint) +g_usb_endpoint_get_kind(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.bDescriptorType; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.bDescriptorType; } /** * g_usb_endpoint_get_maximum_packet_size: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the maximum packet size this endpoint is capable of sending/receiving. * @@ -104,15 +103,15 @@ g_usb_endpoint_get_kind(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint16 -g_usb_endpoint_get_maximum_packet_size(GUsbEndpoint *endpoint) +g_usb_endpoint_get_maximum_packet_size(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.wMaxPacketSize; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.wMaxPacketSize; } /** * g_usb_endpoint_get_polling_interval: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the endpoint polling interval. * @@ -121,15 +120,15 @@ g_usb_endpoint_get_maximum_packet_size(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_polling_interval(GUsbEndpoint *endpoint) +g_usb_endpoint_get_polling_interval(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.bInterval; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.bInterval; } /** * g_usb_endpoint_get_refresh: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the rate at which synchronization feedback is provided, for audio device only. * @@ -138,15 +137,15 @@ g_usb_endpoint_get_polling_interval(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_refresh(GUsbEndpoint *endpoint) +g_usb_endpoint_get_refresh(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.bRefresh; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.bRefresh; } /** * g_usb_endpoint_get_synch_address: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the address if the synch endpoint, for audio device only. * @@ -155,15 +154,15 @@ g_usb_endpoint_get_refresh(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_synch_address(GUsbEndpoint *endpoint) +g_usb_endpoint_get_synch_address(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.bSynchAddress; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.bSynchAddress; } /** * g_usb_endpoint_get_address: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the address of the endpoint. * @@ -172,15 +171,15 @@ g_usb_endpoint_get_synch_address(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_address(GUsbEndpoint *endpoint) +g_usb_endpoint_get_address(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return endpoint->endpoint_descriptor.bEndpointAddress; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return self->endpoint_descriptor.bEndpointAddress; } /** * g_usb_endpoint_get_number: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the number part of endpoint address. * @@ -189,15 +188,15 @@ g_usb_endpoint_get_address(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ guint8 -g_usb_endpoint_get_number(GUsbEndpoint *endpoint) +g_usb_endpoint_get_number(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return (endpoint->endpoint_descriptor.bEndpointAddress) & 0xf; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return (self->endpoint_descriptor.bEndpointAddress) & 0xf; } /** * g_usb_endpoint_get_direction: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets the direction of the endpoint. * @@ -206,17 +205,17 @@ g_usb_endpoint_get_number(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ GUsbDeviceDirection -g_usb_endpoint_get_direction(GUsbEndpoint *endpoint) +g_usb_endpoint_get_direction(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), 0); - return (endpoint->endpoint_descriptor.bEndpointAddress & 0x80) + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), 0); + return (self->endpoint_descriptor.bEndpointAddress & 0x80) ? G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST : G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE; } /** * g_usb_endpoint_get_extra: - * @endpoint: a #GUsbEndpoint + * @self: a #GUsbEndpoint * * Gets any extra data from the endpoint. * @@ -225,8 +224,8 @@ g_usb_endpoint_get_direction(GUsbEndpoint *endpoint) * Since: 0.3.3 **/ GBytes * -g_usb_endpoint_get_extra(GUsbEndpoint *endpoint) +g_usb_endpoint_get_extra(GUsbEndpoint *self) { - g_return_val_if_fail(G_USB_IS_ENDPOINT(endpoint), NULL); - return endpoint->extra; + g_return_val_if_fail(G_USB_IS_ENDPOINT(self), NULL); + return self->extra; } diff --git a/gusb/gusb-endpoint.h b/gusb/gusb-endpoint.h index cc9119b..c642d32 100644 --- a/gusb/gusb-endpoint.h +++ b/gusb/gusb-endpoint.h @@ -15,22 +15,22 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE(GUsbEndpoint, g_usb_endpoint, G_USB, ENDPOINT, GObject) guint8 -g_usb_endpoint_get_kind(GUsbEndpoint *endpoint); +g_usb_endpoint_get_kind(GUsbEndpoint *self); guint16 -g_usb_endpoint_get_maximum_packet_size(GUsbEndpoint *endpoint); +g_usb_endpoint_get_maximum_packet_size(GUsbEndpoint *self); guint8 -g_usb_endpoint_get_polling_interval(GUsbEndpoint *endpoint); +g_usb_endpoint_get_polling_interval(GUsbEndpoint *self); guint8 -g_usb_endpoint_get_refresh(GUsbEndpoint *endpoint); +g_usb_endpoint_get_refresh(GUsbEndpoint *self); guint8 -g_usb_endpoint_get_synch_address(GUsbEndpoint *endpoint); +g_usb_endpoint_get_synch_address(GUsbEndpoint *self); guint8 -g_usb_endpoint_get_address(GUsbEndpoint *endpoint); +g_usb_endpoint_get_address(GUsbEndpoint *self); guint8 -g_usb_endpoint_get_number(GUsbEndpoint *endpoint); +g_usb_endpoint_get_number(GUsbEndpoint *self); GUsbDeviceDirection -g_usb_endpoint_get_direction(GUsbEndpoint *endpoint); +g_usb_endpoint_get_direction(GUsbEndpoint *self); GBytes * -g_usb_endpoint_get_extra(GUsbEndpoint *endpoint); +g_usb_endpoint_get_extra(GUsbEndpoint *self); G_END_DECLS 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); } diff --git a/gusb/gusb-interface.h b/gusb/gusb-interface.h index c1c13f0..523e1dd 100644 --- a/gusb/gusb-interface.h +++ b/gusb/gusb-interface.h @@ -16,24 +16,24 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE(GUsbInterface, g_usb_interface, G_USB, INTERFACE, GObject) guint8 -g_usb_interface_get_length(GUsbInterface *interface); +g_usb_interface_get_length(GUsbInterface *self); guint8 -g_usb_interface_get_kind(GUsbInterface *interface); +g_usb_interface_get_kind(GUsbInterface *self); guint8 -g_usb_interface_get_number(GUsbInterface *interface); +g_usb_interface_get_number(GUsbInterface *self); guint8 -g_usb_interface_get_alternate(GUsbInterface *interface); +g_usb_interface_get_alternate(GUsbInterface *self); guint8 -g_usb_interface_get_class(GUsbInterface *interface); +g_usb_interface_get_class(GUsbInterface *self); guint8 -g_usb_interface_get_subclass(GUsbInterface *interface); +g_usb_interface_get_subclass(GUsbInterface *self); guint8 -g_usb_interface_get_protocol(GUsbInterface *interface); +g_usb_interface_get_protocol(GUsbInterface *self); guint8 -g_usb_interface_get_index(GUsbInterface *interface); +g_usb_interface_get_index(GUsbInterface *self); GBytes * -g_usb_interface_get_extra(GUsbInterface *interface); +g_usb_interface_get_extra(GUsbInterface *self); GPtrArray * -g_usb_interface_get_endpoints(GUsbInterface *interface); +g_usb_interface_get_endpoints(GUsbInterface *self); G_END_DECLS -- cgit v1.2.1