X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Ftime-util.h;h=ec263c1a19b5772afdcea8c48149610641836d3c;hp=6b69940eb5d4f9165cad38aef562e3dab6740fc0;hb=82910f1358c1d15f4e432e6d1f42efdeaf1eddb1;hpb=9a98c7a156709ae16f7e043f866ecb452ce906f8 diff --git a/src/shared/time-util.h b/src/shared/time-util.h index 6b69940eb..ec263c1a1 100644 --- a/src/shared/time-util.h +++ b/src/shared/time-util.h @@ -53,14 +53,15 @@ typedef struct dual_timestamp { #define USEC_PER_YEAR (31557600ULL*USEC_PER_SEC) #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_MAX ((4*4+1)+11+9+4+1) /* weekdays can be unicode */ +#define FORMAT_TIMESTAMP_RELATIVE_MAX 256 #define FORMAT_TIMESPAN_MAX 64 usec_t now(clockid_t clock); dual_timestamp* dual_timestamp_get(dual_timestamp *ts); dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u); +dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u); #define dual_timestamp_is_set(ts) ((ts)->realtime > 0) @@ -71,7 +72,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);