util: rename format_timestamp_pretty() to format_timestamp_relative() because that...

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 146986b46ee1993aa472cd370317567e288cd6b2..820fcc05b5c7c3b2f540d7ab54a51e81118a068b 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -334,7 +334,7 @@ static void print_session_status_info(SessionStatusInfo *i) {
         else
                 printf("%u\n", (unsigned) i->uid);
 
-        s1 = format_timestamp_pretty(since1, sizeof(since1), i->timestamp);
+        s1 = format_timestamp_relative(since1, sizeof(since1), i->timestamp);
         s2 = format_timestamp(since2, sizeof(since2), i->timestamp);
 
         if (s1)
@@ -427,7 +427,7 @@ static void print_user_status_info(UserStatusInfo *i) {
         else
                 printf("%u\n", (unsigned) i->uid);
 
-        s1 = format_timestamp_pretty(since1, sizeof(since1), i->timestamp);
+        s1 = format_timestamp_relative(since1, sizeof(since1), i->timestamp);
         s2 = format_timestamp(since2, sizeof(since2), i->timestamp);
 
         if (s1)

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 3323683339f58a3c4fb328256ba16c9816ebf026..3d00b20eec84069d75a2168542ff8d4fb1448a55 100644 (file)
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -142,7 +142,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
         return buf;
 }
 
-char *format_timestamp_pretty(char *buf, size_t l, usec_t t) {
+char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
         usec_t n, d;
 
         n = now(CLOCK_REALTIME);

diff --git a/src/shared/time-util.h b/src/shared/time-util.h
index 6b69940eb5d4f9165cad38aef562e3dab6740fc0..1f6952cc5cfc4ca9bd74a05f62d1430390b73d7b 100644 (file)
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -71,7 +71,7 @@ usec_t timeval_load(const struct timeval *tv);
 struct timeval *timeval_store(struct timeval *tv, usec_t u);
 
 char *format_timestamp(char *buf, size_t l, usec_t t);
-char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
+char *format_timestamp_relative(char *buf, size_t l, usec_t t);
 char *format_timespan(char *buf, size_t l, usec_t t);
 
 void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index a605ed91b0aad35c6cdb7fb8820168fff31ae0ac..ba4f171fdafe44147add6d0ae7fb0512d6acd4fc 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2125,7 +2125,7 @@ static void print_status_info(UnitStatusInfo *i) {
                     streq_ptr(i->active_state, "activating")    ? i->inactive_exit_timestamp :
                                                                   i->active_exit_timestamp;
 
-        s1 = format_timestamp_pretty(since1, sizeof(since1), timestamp);
+        s1 = format_timestamp_relative(since1, sizeof(since1), timestamp);
         s2 = format_timestamp(since2, sizeof(since2), timestamp);
 
         if (s1)
@@ -2136,7 +2136,7 @@ static void print_status_info(UnitStatusInfo *i) {
                 printf("\n");
 
         if (!i->condition_result && i->condition_timestamp > 0) {
-                s1 = format_timestamp_pretty(since1, sizeof(since1), i->condition_timestamp);
+                s1 = format_timestamp_relative(since1, sizeof(since1), i->condition_timestamp);
                 s2 = format_timestamp(since2, sizeof(since2), i->condition_timestamp);
 
                 if (s1)