Date: Tue, 24 Oct 2023 12:27:48 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8bfa084a4bf3 - stable/13 - ndp: fix timestamp display output Message-ID: <202310241227.39OCRm5Y070835@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bfa084a4bf331b6baf2cc530b9752c4cbe573ad commit 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad Author: R. Christian McDonald <rcm@rcm.sh> AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2023-10-24 07:45:38 +0000 ndp: fix timestamp display output The current xo_format string is incorrect. This restores the display format prior to libxo-ification work while also explicitly marking tv_sec and tv_usec as encoded output only. MFC after: 1 week Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42269 (cherry picked from commit 2bb78b46e02413483409fe73244995524b838b6e) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 5e79666e6c38..37c4ee769bff 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1481,7 +1481,7 @@ ts_print(const struct timeval *tvp) /* Default */ sec = (tvp->tv_sec + thiszone) % 86400; - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310241227.39OCRm5Y070835>