systemctl: use format_timespan() where applicable

diff --git a/fixme b/fixme
index 8143f013b107b13c510d02b53a2963ec44ae47e5..49b69a629f1b05c64490b797147b5cbf5cad5ba0 100644 (file)
--- a/fixme
+++ b/fixme
@@ -41,8 +41,6 @@
 
 * get rid of Subscribe() in systemctl
 
-* use format_timespan where applicable
-
 * Turn around negative options
 
 * Add missing man pages: update systemd.1, finish daemon.7

diff --git a/src/systemctl.c b/src/systemctl.c
index 72bb7d804460830d0d064731346ad4b912f7d029..226ecee3adfaeb82d603864c59850a534b3fd8ec 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1029,6 +1029,10 @@ static int print_property(const char *name, DBusMessageIter *iter) {
 
                         if ((t = format_timestamp(timestamp, sizeof(timestamp), u)) || arg_all)
                                 printf("%s=%s\n", name, strempty(t));
+                } else if (strstr(name, "USec")) {
+                        char timespan[FORMAT_TIMESPAN_MAX];
+
+                        printf("%s=%s\n", name, format_timespan(timespan, sizeof(timespan), u));
                 } else
                         printf("%s=%llu\n", name, (unsigned long long) u);
 
@@ -1165,11 +1169,14 @@ static int print_property(const char *name, DBusMessageIter *iter) {
 
                                 if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &base, true) >= 0 &&
                                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT64, &value, true) >= 0 &&
-                                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT64, &next_elapse, false) >= 0)
-                                        printf("%s={ value=%llu ; next_elapse=%llu }\n",
+                                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT64, &next_elapse, false) >= 0) {
+                                        char timespan1[FORMAT_TIMESPAN_MAX], timespan2[FORMAT_TIMESPAN_MAX];
+
+                                        printf("%s={ value=%s ; next_elapse=%s }\n",
                                                base,
-                                               (unsigned long long) value,
-                                               (unsigned long long) next_elapse);
+                                               format_timespan(timespan1, sizeof(timespan1), value),
+                                               format_timespan(timespan2, sizeof(timespan2), next_elapse));
+                                }
 
                                 dbus_message_iter_next(&sub);
                         }