From nobody Tue Oct 17 19:03:27 2023 X-Original-To: dev-commits-src-main@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 4S93KW5xz7z4xsZZ; Tue, 17 Oct 2023 19:03:27 +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 4S93KW5NLBz3FSX; Tue, 17 Oct 2023 19:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697569407; 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=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=ZoMKXrFk0lLkRxkbDDXNgatS8MMxk89M0C6UwTADEfDCWHid22V6CjwcBVGXSjVOyuv9He YAvXfZ4eZarkQOPn28Wd5YDkZAi8Rm1gAs+xfD/Jc/IUZ91iyEg4TihgNijdQfQMRrDWut EbZRkdmTTPBcAajha+9FD2tKS45XuguiorZYTYyUh9g4I8XejcRfQBzkmV9QhJjbq6DCZL euHqZ+hAPK/wrioc2JWPmhImWcHTG37SxzCfTGDRJwmsCEXx9s9wY5V4MLExrGUXdtybw1 8Nm2qsE4KgmqNr8WHNbrmUGqZC066u/ANo+aGomoOb8v+8WMmH+Ln+77mD9bOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697569407; a=rsa-sha256; cv=none; b=wcn52FU0e5sLt9SfQ5iEGQNapuQTiAfY+9DM9ad2QMtXFmybxQviRP1dLwaLnpfP4au1NK lEVCVqfSLzeSH86lcU0UP54S9O8/m1GV0Xunf63arBzChRxtGhr2SwJv/FsiRQXdFhux6p Ve4IKDO9wZ4hKGaaiiteye7Jy8cauI/t06yNWwcxSA6tgRzIpZb0L0MIZ8A++Bdrq0Rqw6 HPQowPsQN0z0EnhSdDplNklAhWjpu8v8fby7PffjDJE3FSnmReVPTPY/CKOA7di6N/jzma nsclSmHpAOK0uZQWnTxuJBmttz0OXJy33vcGkNroomwloExQbYvlU0HIRodd7w== 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=1697569407; 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=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=tvLlGttAsoB7R3Tt4NsxkkAOQZoZvKrVQycRWY2zb0Am+hvdgrw7iugq/3mPmL59IwUndx 4rRIwdtIgRij3pKF+t9QZaZwondQGDzy1/8lTsPnYUJ+ztjE/Mn8l3GC7byrSd7DJpoC2x WPea1Gt+fpCpA93JGu1esfQEtp0r1hakNh7jJmnlkMiIrVDUuC8Rtb+tdT15PCXw84MkC7 nevXovUMDLcn8LLR1U125Xcqua3E1H0TxU+YdQJDNa+yjnMOaCe25cVQcuStmXsNW56zlH /B7QybRkDGk25guCyzK6lRzjTVEAnTwbLWdvOYuUPNKB4+e40g7iTYeBpb+vXQ== 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 4S93KW4RDrzcGK; Tue, 17 Oct 2023 19:03:27 +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 39HJ3RM5046825; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJ3RKj046822; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:03:27 GMT Message-Id: <202310171903.39HJ3RKj046822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2bb78b46e024 - main - ndp: fix timestamp display output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2bb78b46e02413483409fe73244995524b838b6e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb78b46e02413483409fe73244995524b838b6e commit 2bb78b46e02413483409fe73244995524b838b6e Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 17:01: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 --- 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); }