From d35c0e8d534399faa252a5f44a96c35f887f8bfd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 Aug 2018 13:41:22 +0900 Subject: [PATCH] libudev-queue: use assert_return() --- src/libudev/libudev-queue.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index a62ba5ebfed..e7d8ffea4ca 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -94,12 +94,9 @@ DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(struct udev_queue, udev_queue, udev_queue_f * * Returns: the udev library context. **/ -_public_ struct udev *udev_queue_get_udev(struct udev_queue *udev_queue) -{ - if (udev_queue == NULL) { - errno = EINVAL; - return NULL; - } +_public_ struct udev *udev_queue_get_udev(struct udev_queue *udev_queue) { + assert_return_errno(udev_queue, NULL, EINVAL); + return udev_queue->udev; } @@ -238,7 +235,7 @@ _public_ int udev_queue_get_fd(struct udev_queue *udev_queue) { _public_ int udev_queue_flush(struct udev_queue *udev_queue) { int r; - assert(udev_queue); + assert_return(udev_queue, -EINVAL); if (udev_queue->fd < 0) return -EINVAL; -- 2.47.3