picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util: rename format_timestamp_pretty() to format_timestamp_relative() because that describes much better what it does

This commit is contained in:
Lennart Poettering 2012-11-23 22:12:59 +01:00
parent 9a98c7a156
commit bbb8486e17
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/login/loginctl.c
View File

@ -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)

2
src/shared/time-util.c
View File

@ -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);

2
src/shared/time-util.h
View File

@ -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);

4
src/systemctl/systemctl.c
View File

@ -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)