From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 23 Apr 2011 22:36:22 +0000 (+0200)
Subject: libudev: queue - _unref() should return the object
X-Git-Tag: 174~160
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f6577968a2f86aade8fff503a53fa52a7245251a

libudev: queue - _unref() should return the object
---

diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index dbe7fd17f..2fcfe4131 100644
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -201,7 +201,7 @@ ssize_t udev_queue_skip_devpath(FILE *queue_file);
 
 /* libudev-queue-private.c */
 struct udev_queue_export *udev_queue_export_new(struct udev *udev);
-void udev_queue_export_unref(struct udev_queue_export *udev_queue_export);
+struct udev_queue_export *udev_queue_export_unref(struct udev_queue_export *udev_queue_export);
 void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export);
 int udev_queue_export_device_queued(struct udev_queue_export *udev_queue_export, struct udev_device *udev_device);
 int udev_queue_export_device_finished(struct udev_queue_export *udev_queue_export, struct udev_device *udev_device);
diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 2f1afecb2..a799be062 100644
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -90,13 +90,14 @@ struct udev_queue_export *udev_queue_export_new(struct udev *udev)
 	return udev_queue_export;
 }
 
-void udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
+struct udev_queue_export *udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
 {
 	if (udev_queue_export == NULL)
-		return;
+		return NULL;
 	if (udev_queue_export->queue_file != NULL)
 		fclose(udev_queue_export->queue_file);
 	free(udev_queue_export);
+	return NULL;
 }
 
 void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)