From nobody Tue Oct 24 12:27:48 2023 X-Original-To: dev-commits-src-all@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 4SFBCn2BFJz4y01T; Tue, 24 Oct 2023 12:27:49 +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 4SFBCn0GM9z4R5j; Tue, 24 Oct 2023 12:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150469; 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=miPa/33H58cDYCCaY3QnhdNYOOkPP7n61f+wjz17qHw=; b=QMqorreqa4jQW22QWuEUhqG5UjwiyzpqyEkP8+qvODIN9VC+p5U8eodA/ygOjmyP6ydtB8 YSQcoPB9QhLtf1U5MbMEG77Mj5te1YyX6YQjCsCOZXAod0tPBVWJeIeopLMbaJyfzoABpJ pqqnHEjt8RcobP58BveKTYNFukkUcLT8MFmjmtEKwXcjoBNr2Ug/DQvIuz3liVcd/9sEDl b00LtP/TyT36hMxQST0E7kN2wnt95QA/MZS21uJe0kK4mxlUNwXVjQGTmuYRGPOcz45h+E CS3ALjwtDmSwQLSfaFUp9DOPYqVPIjLTSKpim/hsPnp7drPinUWD/3XhH+TbLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698150469; a=rsa-sha256; cv=none; b=tmCAhe2Ldyl5akfMCcD4+mlbXQ0X1iISQpetOgIRgXYPotp+u8HxClRq5bZ01rrTV2X+NU PUV2vMO1+FEoJ3WlkHYm17G8f1Vdr0RpdSbcPQ3d+huJ7Dlo7AERve4Opp/0lvqOVmVQYI Q7s5ZsocLdDA9epkPyqoZVi5+qsUY/SR/XxcD1EujPIVHI6kMy+i22BFZJ7i5x4QitouHR oVoyjMQO+wbF6TuphYnybVUoVaDVmAJFofqNuVbsFem81AjDfYWThiIsps/Ca8KPOTYGrY Vw7FYOHbkzM0UZffnhSrXG1vdT8sSb14f3orbORMKd5BWp3F682hOt0BFc/ACA== 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=1698150469; 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=miPa/33H58cDYCCaY3QnhdNYOOkPP7n61f+wjz17qHw=; b=yp0eOrvypb79Ef3Yxj1XxNB6fpuMBxn8GncwkYuqLNQF9vcwR7xZYZButlVncPNG7YZIOf M+AiM3HkaJEda70QYpKZmyArHAjWdbceBXKhWuoX/EvhxBTSCIfurVCDUHtyfBsC9XIqfR Akzl8Hi3W1ZcnwWTJcriuscvNJXmGCWySRTIl4pJnjBJr/5XQYOt2VC0QdjS2wXKIFLVji wjb8QmT2SG7D4S49ldF99rfFQdavxOEL2NC+Iks0s4B4gOst7IpPylQy6ODGdx/pdmcqPm Umm/egy6OXtk94IqYtDDJJI3BrQnuwk7zINt4KNevrPlFVae4nPxE0L4L6BH9w== 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 4SFBCm6KcGz7lk; Tue, 24 Oct 2023 12:27:48 +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 39OCRmxB070838; Tue, 24 Oct 2023 12:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCRm5Y070835; Tue, 24 Oct 2023 12:27:48 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:27:48 GMT Message-Id: <202310241227.39OCRm5Y070835@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: 8bfa084a4bf3 - stable/13 - ndp: fix timestamp display output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bfa084a4bf331b6baf2cc530b9752c4cbe573ad commit 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost 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); }