From nobody Tue Oct 24 12:27:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBCq1ngrz4y01c; Tue, 24 Oct 2023 12:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFBCq1JWyz4R9T; Tue, 24 Oct 2023 12:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QS3IbmvlNsWGLo42JWN+owqG9bTO+fTnr0mNI+2YLSY=; b=vKtwHZrdowVB6XyzGiFb4viDMZSNcgq+VPUCvonmwbYd/iZA1ETNi75BwkKeWuHqDwacQG bH0OwnKvkbDxX00angx1j6UoyLPm52FJSr+YitvoP4lblp3Fop821ueZXOOxxHS0qOi/Nd SzGFxIAJp7BF+iBsiJ60Bwh1uIjcWzbB6NzeY/62uqK7l2mt6QxjUlIV5eq0LJDBu60IJ5 lNZkoI600FqLj4RCptfl7U7qU6JBmHZ6osypodFKI+Shq5hVKLeMEiyFfEi1HFnjzh88mH Bb4B3cYJIxnvkd37pUVjeTR3v4XIdgj/wE5cjGsxA1CFLp5LSVydIntfPAC7IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698150471; a=rsa-sha256; cv=none; b=gAW4CFd+D4giBEYKTnUZvrOcr3xxm2kcHDscFLtcnHKa7w0o4/ip+gL54ky4z+nBVSbn/X N3bPCGIgwY0lSySG/AazoUh5zrnYQg5iyS6HcJYBG66z/r2fNx9kGezw9tEhympz7KQUYw X2mneHxZgXu1HOkaMNzbjWJgziHFGmrKCo3Z+Oo6hbEykctrnOHaUc2M4/h8r2gfxJTzwm zneYxpHNUcm2tfUHucKsyqMaMXl2BJe09qo4HMtJB4BZlGfqVV3HPNFcHVlhHQzUtbLbj6 7+bZWzX75xLAAEaNR8adKFbQ1ZZKccaEvpOfurRBrYNRlO/nfSkpQ8m8hpNzUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QS3IbmvlNsWGLo42JWN+owqG9bTO+fTnr0mNI+2YLSY=; b=x46hBKqFD6qry0d52ArZsQtlVTaP2x0ZLdUd0BKDAoZxFveJOLqor7eI2yUlqWq6zGQ5km oXkyDjISo83Bpu3A7yJ+mgd64D06sJEYeLltZhP07QA36EwEZD+q7mn3jk4oomQE/qtIt7 9lWeJuCPMY8q0ht0cJbuXZQ90Mli6bt4mACdsqL181ksyj5MuPGXm8/FFPOLsgwGpFAjQr IObNsc3EVQbQc9haL3Iqt6adPBPBTkjuaWiYNHkQlmqk2W7gSVoehQGi9Hl8g2rU6qXTG/ g4YZJ1Ravr/qA0vT9xGXQuwyPO+8jg00NcLr2SP8Z3UeukFIcdlUk7ZOLzlwfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFBCq0Mf5z7Yv; Tue, 24 Oct 2023 12:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OCRoQB071004; Tue, 24 Oct 2023 12:27:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCRoPa071001; Tue, 24 Oct 2023 12:27:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:27:50 GMT Message-Id: <202310241227.39OCRoPa071001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 169746a877f6 - stable/14 - ndp: fix timestamp display output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 169746a877f6f90214fec17bc0861eaf94cde855 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=169746a877f6f90214fec17bc0861eaf94cde855 commit 169746a877f6f90214fec17bc0861eaf94cde855 Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:45:35 +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 1e3469d54228..b7bc25dd7aa4 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1544,7 +1544,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); }