From: fangxiuning <fangxiuning123@126.com>
Date: Sat, 11 Jul 2020 10:13:01 +0000 (+0800)
Subject: bus: use bus_log_parse_error to print message
X-Git-Tag: v246-rc2~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d67b1d18fcda2c8c5aacfc50f9591c8dc7a4a8a1;p=thirdparty%2Fsystemd.git

bus: use bus_log_parse_error to print message
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 56fb8d93676..ccb22d5f8bc 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1322,7 +1322,7 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
 
                         r = sd_bus_message_read(m, "s", &name);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to read lost name: %m");
+                                return bus_log_parse_error(r);
 
                         if (streq(name, unique_name))
                                 is_monitor = true;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 63e2f61d299..8c51cc12b22 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -104,7 +104,7 @@ static int match_prepare_for_sleep(sd_bus_message *message, void *userdata, sd_b
 
         r = sd_bus_message_read(message, "b", &b);
         if (r < 0) {
-                log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m");
+                bus_log_parse_error(r);
                 return 0;
         }
 
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 2ecfcf498b0..45687c8fcab 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -1987,7 +1987,7 @@ static int match_prepare_for_sleep(sd_bus_message *message, void *userdata, sd_b
 
         r = sd_bus_message_read(message, "b", &b);
         if (r < 0) {
-                log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m");
+                bus_log_parse_error(r);
                 return 0;
         }
 
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index eaac3b3e355..49d68d25334 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -664,7 +664,7 @@ static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error
 
         r = sd_bus_message_read(m, "s", &name);
         if (r < 0)
-                return log_error_errno(r, "Failed to read interface name: %m");
+                return bus_log_parse_error(r);
 
         if (!streq_ptr(name, "org.freedesktop.timesync1.Manager"))
                 return 0;