From 9185c8e6266d607df665d24f525b48b39e20d847 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Nov 2012 22:51:55 +0100 Subject: [PATCH] =?utf8?q?time-util:=20also=20rename=20FORMAT=5FTIMESTAMP?= =?utf8?q?=5FPRETTY=20=E2=86=92=20=5FMAX?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/login/loginctl.c | 4 ++-- src/shared/time-util.h | 2 +- src/systemctl/systemctl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 820fcc05b..cfbc5fe02 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -323,7 +323,7 @@ typedef struct SeatStatusInfo { } SeatStatusInfo; static void print_session_status_info(SessionStatusInfo *i) { - char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; + char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; assert(i); @@ -418,7 +418,7 @@ static void print_session_status_info(SessionStatusInfo *i) { } static void print_user_status_info(UserStatusInfo *i) { - char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; + char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; assert(i); diff --git a/src/shared/time-util.h b/src/shared/time-util.h index 1f6952cc5..4017b57d2 100644 --- a/src/shared/time-util.h +++ b/src/shared/time-util.h @@ -54,7 +54,7 @@ typedef struct dual_timestamp { #define NSEC_PER_YEAR (31557600ULL*NSEC_PER_SEC) #define FORMAT_TIMESTAMP_MAX (6+11+9+4+1) -#define FORMAT_TIMESTAMP_PRETTY_MAX 256 +#define FORMAT_TIMESTAMP_RELATIVE_MAX 256 #define FORMAT_TIMESPAN_MAX 64 usec_t now(clockid_t clock); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index ba4f171fd..7a19d06a0 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2056,7 +2056,7 @@ static void print_status_info(UnitStatusInfo *i) { ExecStatusInfo *p; const char *on, *off, *ss; usec_t timestamp; - char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; + char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; const char *path; -- 2.30.2