From nobody Sun Oct 02 04:30:09 2022 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 4Mg9xF3SRnz4dtJf; Sun, 2 Oct 2022 04:30:09 +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 4Mg9xF2rHYz46sX; Sun, 2 Oct 2022 04:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685009; 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=JS5dJFZWUxIANgt95pF7F9trbgiibjlJtoSgoopyYrs=; b=SJzE9d9PblgrLrleKd38CQmsryW6fPRkXS+8wKIJhwm3ImjuekIaDiJMZ2TYL6XTyjU4td QkXQW/XpjTMojrt1mG1kACHB1G/hDroAmHaFWXvZWbbcdXYphtINrR8T2gEp2UBhGfIE5H 8DATl5zGkDwE2N3fo24e5yeEGuqS2Q3/sLsZZ+zDtu3wjXmuNF12rgumsEzfPV8ByPMG3E q97mrFST8PW2bqEbPhmI4NiyrbGNoZ3u2+NlDqUx2lRxcQ3w5/OlGWu2h6nov4kt0prsNK Ail8wpopR9k1BidnYv2Z/x4+qPHOwSWokyn2z/BPo2FVbrl2XPKdNxRg1QriJQ== 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 4Mg9xF1x8vzlKQ; Sun, 2 Oct 2022 04:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2924U9Jl062130; Sun, 2 Oct 2022 04:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924U9rm062127; Sun, 2 Oct 2022 04:30:09 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:30:09 GMT Message-Id: <202210020430.2924U9rm062127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: bb3d7c88ee05 - stable/13 - sysctl_dumpentry: move error to inner scope 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb3d7c88ee05a47f1a684cd0e3ca82ca8ba1eec2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685009; 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=JS5dJFZWUxIANgt95pF7F9trbgiibjlJtoSgoopyYrs=; b=swkoVouskEB/I+ShnV7QFoTAZPPwsPT0/oPPpFnLe6eBVFc74I1yUG5UzYelOskbdgNb6O or7+LGh/GHyqjNBt0gKm73AoeJ6GCBwx0UMo6Ubw3O0qnllq1WOc1qwWSUCTqv5S0qNEdz TAnvvKLldP1HYKPVBBfiChLjQlVzTQODgo5XA1wwXVu/GgUs4C+lBJqi5dx894lEP0bPo6 Iv3sBRaJ4dLdmPb99/XEkWjl7VKso9EzrOJiB2WZAMp/UuTtjkYtW4/JF6K7LTsYcDI/XE Z0FiVEYDK2fVWu6V95n5vE88i4iPXcOahADVSflDFBb5VMC3d6v8Klfn/1/dXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664685009; a=rsa-sha256; cv=none; b=RTFAuVbqIULXqngPZwgtTOsephCB47jTfssPn/Ga0lUbK03//Evc8lnoplMIFLFPcJnOtE 1Skl6FoT8V1qqQbSQZ9+D6uL4/6CmA6/IIQ9sIt0xt3PG6Z9mXNBdBnIlUbPMkQ56cm9zm ViT/1TWbm270XeTVTWH0lbwFRqf+63pPE0zVaPhtVCQBkaqrgxNblbK+HrVlONsvdzdWbZ MTnAnDuw5Yd0VBSdBYZVO4SGzDuQnlQnkQeGF2QBfBDhY0ggC6z2hpgZSMqjrEGmYF/q7L GRJDW/fiLFckz0ipKkeJ/fblVbwkFLt8P1DdrKhTzciAetsV7PwS6PyMN7gw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bb3d7c88ee05a47f1a684cd0e3ca82ca8ba1eec2 commit bb3d7c88ee05a47f1a684cd0e3ca82ca8ba1eec2 Author: Warner Losh AuthorDate: 2022-07-08 17:53:34 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:57 +0000 sysctl_dumpentry: move error to inner scope Sponsored by: Netflix (cherry picked from commit e606e5d1572684b978ca0572da776a597ffe0d94) --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 5f386a2142f6..7802c7d8da9e 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -2205,7 +2205,6 @@ sysctl_dumpentry(struct rtentry *rt, void *vw) { struct walkarg *w = vw; struct nhop_object *nh; - int error = 0; NET_EPOCH_ASSERT(); @@ -2217,6 +2216,7 @@ sysctl_dumpentry(struct rtentry *rt, void *vw) if (NH_IS_NHGRP(nh)) { struct weightened_nhop *wn; uint32_t num_nhops; + int error; wn = nhgrp_get_nhops((struct nhgrp_object *)nh, &num_nhops); for (int i = 0; i < num_nhops; i++) { error = sysctl_dumpnhop(rt, wn[i].nh, wn[i].weight, w); @@ -2225,7 +2225,7 @@ sysctl_dumpentry(struct rtentry *rt, void *vw) } } else #endif - error = sysctl_dumpnhop(rt, nh, rt->rt_weight, w); + sysctl_dumpnhop(rt, nh, rt->rt_weight, w); return (0); }