summaryrefslogtreecommitdiff
path: root/gusb/gusb-device.c
diff options
context:
space:
mode:
authorIgnacio Casal Quinteiro <icq@gnome.org>2015-01-08 12:13:46 +0100
committerIgnacio Casal Quinteiro <icq@gnome.org>2015-01-08 12:16:34 +0100
commitdd4c51280e5fbcc56d3d46669377542c6589e87d (patch)
tree084ff2d4c9ff2cda2646da5254c13dfe70f6272a /gusb/gusb-device.c
parentfac8f21e5e111e62571c1e849da6c622c80ffc0a (diff)
downloadgusb-dd4c51280e5fbcc56d3d46669377542c6589e87d.tar.gz
Remove the cleanup attributes from the rest of the code
Diffstat (limited to 'gusb/gusb-device.c')
-rw-r--r--gusb/gusb-device.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gusb/gusb-device.c b/gusb/gusb-device.c
index 5ddf687..49d7e86 100644
--- a/gusb/gusb-device.c
+++ b/gusb/gusb-device.c
@@ -33,7 +33,6 @@
#include <libusb-1.0/libusb.h>
-#include "gusb-cleanup.h"
#include "gusb-context.h"
#include "gusb-context-private.h"
#include "gusb-util.h"
@@ -84,9 +83,11 @@ g_usb_device_get_parent (GUsbDevice *device)
{
GUsbDevicePrivate *priv = device->priv;
libusb_device *parent;
+
parent = libusb_get_parent (priv->device);
if (parent == NULL)
return NULL;
+
return g_usb_context_find_by_bus_address (priv->context,
libusb_get_bus_number (parent),
libusb_get_device_address (parent),
@@ -108,7 +109,7 @@ g_usb_device_get_children (GUsbDevice *device)
GUsbDevice *device_tmp;
GUsbDevicePrivate *priv = device->priv;
guint i;
- _cleanup_ptrarray_unref_ GPtrArray *devices = NULL;
+ GPtrArray *devices = NULL;
/* find any devices that have @device as a parent */
children = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
@@ -118,6 +119,9 @@ g_usb_device_get_children (GUsbDevice *device)
if (priv->device == libusb_get_parent (device_tmp->priv->device))
g_ptr_array_add (children, g_object_ref (device_tmp));
}
+
+ g_ptr_array_unref (devices);
+
return children;
}