From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 22 Oct 2018 03:49:23 +0000 (+0900)
Subject: sd-device-monitor: use log_device_*()
X-Git-Tag: v240~485^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6124e64a510e2384b1f361cb1d7e5265f860683;p=platform%2Fupstream%2Fsystemd.git

sd-device-monitor: use log_device_*()
---

diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 5a604fe..9c534a0 100644
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -454,10 +454,9 @@ int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) {
         /* Skip device, if it does not pass the current filter */
         r = passes_filter(m, device);
         if (r < 0)
-                return log_debug_errno(r, "Failed to check received device passing filter: %m");
-
+                return log_device_debug_errno(device, r, "Failed to check received device passing filter: %m");
         if (r == 0)
-                log_debug("Received device does not pass filter, ignoring");
+                log_device_debug(device, "Received device does not pass filter, ignoring");
         else
                 *ret = TAKE_PTR(device);
 
@@ -522,7 +521,7 @@ int device_monitor_send_device(
         /* fill in versioned header */
         r = sd_device_get_subsystem(device, &val);
         if (r < 0)
-                return log_debug_errno(r, "Failed to get device subsystem: %m");
+                return log_device_debug_errno(device, r, "Failed to get device subsystem: %m");
         nlh.filter_subsystem_hash = htobe32(string_hash32(val));
 
         if (sd_device_get_devtype(device, &val) >= 0)
@@ -557,13 +556,13 @@ int device_monitor_send_device(
         count = sendmsg(m->sock, &smsg, 0);
         if (count < 0) {
                 if (!destination && errno == ECONNREFUSED) {
-                        log_debug("Passed device to netlink monitor");
+                        log_device_debug(device, "Passed to netlink monitor");
                         return 0;
                 } else
-                        return log_debug_errno(errno, "Failed to send device to netlink monitor: %m");
+                        return log_device_debug_errno(device, errno, "Failed to send device to netlink monitor: %m");
         }
 
-        log_debug("Passed %zi byte device to netlink monitor", count);
+        log_device_debug(device, "Passed %zi byte to netlink monitor", count);
         return count;
 }