From nobody Mon Jan 19 22:08:49 2026 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 4dw4Nf2LY1z6PR5g for ; Mon, 19 Jan 2026 22:08:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw4Nd6m7yz40gY for ; Mon, 19 Jan 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860530; 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=FAUWK3BDszfOUdttIrgdNR414VMCIVYIydFatjXRxd0=; b=nCufRWWIf8wtPaoOmQim+wnSz0LDcBu3tbz7UozNNZKejkiVH3f/7D1xMmkesblj+iH9vE L1kjRA+MIT/kfhAW7gB6eSKboFxm4271Cp4zAMzVBEcikV4U9j82vSRSOVkpnjvkxGRay+ 5baXJR3qJAJSfrk5XugUTEEWPBmvGsOU4rfcJGHvNL+HYWrtZrJ+Il2F/9lkzOasZKzvFi xsVBAO4mOvuREOh+HF5/wtQmKe11/x+bJ2aukFQZdDapv93qiV3F/Yas3GoEJjkwKDh5w4 PFroNii2QZ50ZUJmE2AeJ6VSgSFX7ALJPicqwe5+lvdfOXD+ggRfT3wdH2zu+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860530; 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=FAUWK3BDszfOUdttIrgdNR414VMCIVYIydFatjXRxd0=; b=VTV0qViYmwgUjfhbLHC/bK0kJE7HytwRvSlEMh7GuRtTPU2wNyw/IpqL55x0LobZdrMkpl r9rXt2s4IpVafVHbIR5c0enLe26JhGqxCZg9+m/AEcMpKrS+utMv8feHg5iplMxijCynkE SYq22TvPxm1tlypwBxxE1Cc4e1X4jFra5v2AAwjLQuiZi0CtV/6sXoSFrki7nPy6MUxR+J gNiMix1bkT+za07r4c8EfOi3IepEzAjMQeN4t6cLaEKkyMV/+KH2z7JAncH6W2Wc1G/R5D 538fzl0AF08qZnR5iuYbnSLZIfvSp3G+tyiTGFg/4XIFlSMR8B5dzj2fbuKsHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768860530; a=rsa-sha256; cv=none; b=bwbAJoDsn4Tow8pLYmNhZbeIJRv0KBtkSbmkUzZWtbuITaOuQk3x2OyaeiVAfolXkx3wQ4 s63TQ24WAb4rmuGRLKYstSt6DanAskpSe1alXUnzBaYzKjKVtjutQXqhREzE8TpetZuiAX JCBY/gUWsUTZ9GiJdkFeqZI4QwOqpeVBBQx/uqNp00Zrz6B/M/MLdcwH/28J8XoKcrG/J+ oWVyW4RNkFgRPP+9vM1cf6C15oZQpSSWqLzMRWfeYgPD6PRYhqPWaENX3FShizWktd9YX1 wD71TlUFvoi8tVCssmlpr1zKbWFvDO9xe+eMnn33BzoT8SRtEg3xXgsbos+6GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dw4Nd64BNzr01 for ; Mon, 19 Jan 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 22:08:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: f51bc79200fe - stable/15 - sockstat: improve formataddr() according to style(9) 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f51bc79200fea740de3beb3d7dbdec1537a2839b Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 22:08:49 +0000 Message-Id: <696eab71.35c4c.2e87414c@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=f51bc79200fea740de3beb3d7dbdec1537a2839b commit f51bc79200fea740de3beb3d7dbdec1537a2839b Author: Michael Osipov AuthorDate: 2025-12-29 21:31:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-19 22:08:30 +0000 sockstat: improve formataddr() according to style(9) Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54412 (cherry picked from commit f89f7e58ba1d54c6a683e3cc899938895496c088) --- usr.bin/sockstat/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 07663e54534d..75c4b2aad223 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -895,8 +895,8 @@ static int formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) { struct sockaddr_un *sun; - char addrstr[NI_MAXHOST] = { '\0', '\0' }; int error, off, port = 0; + char addrstr[NI_MAXHOST] = ""; switch (ss->ss_family) { case AF_INET: @@ -929,11 +929,11 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) if (is_xo_style_encoding) { xo_emit("{:address/%s}", addrstr); xo_emit("{:port/%d}", port); - return 0; + return (0); } if (port == 0) - return snprintf(buf, bufsize, "%s:*", addrstr); - return snprintf(buf, bufsize, "%s:%d", addrstr, port); + return (snprintf(buf, bufsize, "%s:*", addrstr)); + return (snprintf(buf, bufsize, "%s:%d", addrstr, port)); } static const char *