diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-05-26 03:06:52 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-05-27 02:13:58 +0200 |
| commit | 756c6f66aee83a5862a6f936a316f761532f3320 (patch) | |
| tree | 7a838eb2a7ae4effdadb4798e56f713f10b8524b /misc.h | |
| parent | upstream: avoid possible NULL deref; from Pedro Martelletto (diff) | |
| download | openssh-756c6f66aee83a5862a6f936a316f761532f3320.tar.xz openssh-756c6f66aee83a5862a6f936a316f761532f3320.zip | |
upstream: add fmt_timeframe() (from bgpd) to format a time
interval in a human- friendly format. Switch copyright for this file from BSD
to MIT to make it easier to add Henning's copyright for this function. ok
markus@
OpenBSD-Commit-ID: 414a831c662df7e68893e5233e86f2cac081ccf9
Diffstat (limited to 'misc.h')
| -rw-r--r-- | misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.84 2020/01/24 23:54:40 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.85 2020/05/26 01:06:52 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -66,6 +66,7 @@ int parse_user_host_path(const char *, char **, char **, char **); int parse_user_host_port(const char *, char **, char **, int *); int parse_uri(const char *, const char *, char **, char **, int *, char **); long convtime(const char *); +const char *fmt_timeframe(time_t t); char *tilde_expand_filename(const char *, uid_t); char *percent_expand(const char *, ...) __attribute__((__sentinel__)); char *tohex(const void *, size_t); |