summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-11-23 22:51:55 +0100
committerLennart Poettering <lennart@poettering.net>2012-11-23 22:51:55 +0100
commit9185c8e6266d607df665d24f525b48b39e20d847 (patch)
tree9de1d9422fdc6e7fc26ddcf6ac4aee6d1d046105
parentdecad9103eab4c5f24dbc55dc7d2cdabce87a302 (diff)
time-util: also rename FORMAT_TIMESTAMP_PRETTY → _MAX
-rw-r--r--src/login/loginctl.c4
-rw-r--r--src/shared/time-util.h2
-rw-r--r--src/systemctl/systemctl.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 820fcc05b5..cfbc5fe02b 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 1f6952cc5c..4017b57d25 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 ba4f171fda..7a19d06a0c 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;