From bc54df90e4eec1b5ab1596c1c758593821485676 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 28 Aug 2018 13:15:03 +0900 Subject: [PATCH] libudev: modernize code a bit --- src/libudev/libudev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index 0c3524a209e..4554b922e3f 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -40,8 +40,8 @@ struct udev { * Returns: stored userdata **/ _public_ void *udev_get_userdata(struct udev *udev) { - if (udev == NULL) - return NULL; + assert_return(udev, NULL); + return udev->userdata; } @@ -53,8 +53,9 @@ _public_ void *udev_get_userdata(struct udev *udev) { * Store custom @userdata in the library context. **/ _public_ void udev_set_userdata(struct udev *udev, void *userdata) { - if (udev == NULL) + if (!udev) return; + udev->userdata = userdata; } @@ -126,10 +127,11 @@ _public_ struct udev *udev_unref(struct udev *udev) { * This function is deprecated. * **/ -_public_ void udev_set_log_fn(struct udev *udev, - void (*log_fn)(struct udev *udev, - int priority, const char *file, int line, const char *fn, - const char *format, va_list args)) { +_public_ void udev_set_log_fn( + struct udev *udev, + void (*log_fn)(struct udev *udev, + int priority, const char *file, int line, const char *fn, + const char *format, va_list args)) { return; }