From nobody Sun Oct 02 04:30:08 2022 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 4Mg9xD4FY0z4dtMv; Sun, 2 Oct 2022 04:30:08 +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 4Mg9xD2KFTz46mS; Sun, 2 Oct 2022 04:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685008; 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=kyCxZJ4cJpBbSyWqBZmOwAW51xeE8iCfKNlYrycnRzs=; b=UK6cb+zP/ohpKZmeDUddJXTynfx6XsHSuDdey6MOFxoAAuR7tUCrMKMHGyY1WD8dmLK2Qz 0TRwfOhZOG7Wkg8M1an6/0d4shu7eHpV7mMABu9IVLsGkeBZPO/5mOvFyBBoFWqHC9ZUKa Oi0Bp+FHu43vmnuc9/cBqJGmPQtWX5kvntWG5TIG4WmZGraiMggtK6neogPOwA8BpAhdKm JQFt0CVvsBVl64YNCDxJ51fFyJOpHjTwoxUwMyLETJoRsQ9ZEq5fUtgPELAaouxEkSZ0Yc ZwVpztthQdeHi2Q2GgY0j4+o+tHk2rJ1tJ3zftOA6+2xqvnsKQHzXp7Ol3+3dQ== 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 4Mg9xD1MdPzlQV; Sun, 2 Oct 2022 04:30:08 +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 2924U8Ha061916; Sun, 2 Oct 2022 04:30:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924U8nK061914; Sun, 2 Oct 2022 04:30:08 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:30:08 GMT Message-Id: <202210020430.2924U8nK061914@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: 8a35f2f0b722 - stable/13 - route_ctl: eliminate write only variables ifa and nh 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a35f2f0b72213b112973fb2a66eba5c249ed6aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685008; 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=kyCxZJ4cJpBbSyWqBZmOwAW51xeE8iCfKNlYrycnRzs=; b=I4TOV7zlqfam0ml5pl85ML+OK7Fa6aItbxFVaiXQzVu1RjmcqrVBTJlLsCa4d9MZ1w1UtF A6IQBbHHk3e+mbYIc/wnejHVeOLt8G9XwS0j7/g0gedf2NKib3g3MkfklzILGZRUHqTulx OZYPM2OiXfIv/uvYzwc9ioR/2GVSwSTPDFFm9XTnMzMn4ZZFUYj/eDqCQUltovCXi9zCZT x6cRrE/0qT24ye9RG3V8S1qg7zJubK1+IW3LvQ+bIbwyvr5Dm/GcbmMOLfWe0+Kxbh0uiT ESp8MY1BpltF6MJFxWWcQNuxZ6S6I+NVQ7GpHtJb6vQEqJsT0ERDeu4rCi3/4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664685008; a=rsa-sha256; cv=none; b=oxzGqrEu/5bLyHCVcOP4w8mdqvKPH/JGysySh8Gt9Ly4FoLUKoUxiXv86rGLgnUSVY1Lt1 Wm2Fsx01eLT0YnCTDmkDRhL/CX1kbfovyel4+qkY53vM2kqEAfq582KH2V+dX2U2ztw8et pB4MjDrrbPynUGGzJ6ZFp87stv6DNeg5C6YA6pHRjh19GZZHg74EeNQWp9OwYAcuz5GQyt piY9lxb41AUPDqa7jSAtR+Fr5CIgQTWtzVf7ZpTDeCuENcdf1ZpB14i+P0MSDZvVi4zp10 oGI2YYodoNNVTh4q5kXA1TLV08YsWEjlba7KbZzM7hfriKKOUnv6pcX22NMPVg== 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=8a35f2f0b72213b112973fb2a66eba5c249ed6aa commit 8a35f2f0b72213b112973fb2a66eba5c249ed6aa Author: Warner Losh AuthorDate: 2022-07-08 17:53:34 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:56 +0000 route_ctl: eliminate write only variables ifa and nh Sponsored by: Netflix (cherry picked from commit 5de5b5a34db93a2a646e88d39a8e7718f925636f) --- sys/net/route/route_ctl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 292233541406..890a25b5f546 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -630,7 +630,6 @@ create_rtentry(struct rib_head *rnh, struct rt_addrinfo *info, struct sockaddr *dst, *ndst, *gateway, *netmask; struct rtentry *rt; struct nhop_object *nh; - struct ifaddr *ifa; int error, flags; dst = info->rti_info[RTAX_DST]; @@ -686,7 +685,6 @@ create_rtentry(struct rib_head *rnh, struct rt_addrinfo *info, * This moved from below so that rnh->rnh_addaddr() can * examine the ifa and ifa->ifa_ifp if it so desires. */ - ifa = info->rti_ifa; rt->rt_weight = get_info_weight(info, RT_DEFAULT_WEIGHT); rt_set_expire_info(rt, info); @@ -1061,10 +1059,9 @@ change_route(struct rib_head *rnh, struct rt_addrinfo *info, struct route_nhop_data *rnd_orig, struct rib_cmd_info *rc) { int error = 0; - struct nhop_object *nh, *nh_orig; + struct nhop_object *nh_orig; struct route_nhop_data rnd_new; - nh = NULL; nh_orig = rnd_orig->rnd_nhop; if (nh_orig == NULL) return (ESRCH);