From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 13 Oct 2018 16:12:22 +0000 (+0900)
Subject: udev: replace udev_device by sd_device in udev-builtin-uaccess.c
X-Git-Tag: v240~493^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b60fe6e83172413ef13a7fc6e20e417f73bc6ff;p=platform%2Fupstream%2Fsystemd.git

udev: replace udev_device by sd_device in udev-builtin-uaccess.c
---

diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 695a411..6806b9e 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -15,11 +15,12 @@
 #include "log.h"
 #include "udev-builtin.h"
 
-static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) {
+static int builtin_uaccess(struct udev_device *_dev, int argc, char *argv[], bool test) {
         int r;
         const char *path = NULL, *seat;
         bool changed_acl = false;
         uid_t uid;
+        sd_device *dev = _dev->device;
 
         umask(0022);
 
@@ -27,9 +28,11 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
         if (!logind_running())
                 return 0;
 
-        path = udev_device_get_devnode(dev);
-        seat = udev_device_get_property_value(dev, "ID_SEAT");
-        if (!seat)
+        r = sd_device_get_devname(dev, &path);
+        if (r < 0)
+                goto finish;
+
+        if (sd_device_get_property_value(dev, "ID_SEAT", &seat) < 0)
                 seat = "seat0";
 
         r = sd_seat_get_active(seat, NULL, &uid);