From nobody Fri Jan 13 21:24:40 2023 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 4NtvZK0q5Zz2qkN0; Fri, 13 Jan 2023 21:24:41 +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 4NtvZK0My4z4009; Fri, 13 Jan 2023 21:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645081; 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=epgrOYi+r134/ed/n+8Qlu+LsJPZwiJAuru7NDq6h20=; b=BwvhHdYXdRomDL03gkFkSJ2WRmdnpgB3e0fcDcag8W8dVdSTPCUweamJ2hCQdYopLzhTtu qAQDXLWuy2+WG/IHcbYLY1+/Fl66EcoiT1ZtiSofOTYiItxgUn/YnfsHVeNKMk7h2vNdcA UoaM3GpWUh0avBvQwU06enZVxRZ4Bzlz7PgXDHtVwRiSipLXMFt34O4UhPDR5qhNPJLBK5 dDQKnUL1nc8SrJohNeWzynk5160dIFeOfL4ts++d7BvjNfvOShzS+PayyDVAE+V7+AC7g9 ZzAciRkjh10yMyVFwCjGBZPllTBFpR24dwZq76VayKK5dPSnLm7s0UXbDEXiJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645081; 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=epgrOYi+r134/ed/n+8Qlu+LsJPZwiJAuru7NDq6h20=; b=nlz3S/y4ZU0LmWxoowk7Oeftrk+hylk3pNi2YfAmxdfmZUsPoGbPkf4lb+k+6qYYmKlkUv cLpU0qawhEH/HN11+EwcPC8QUZz/0QFKk4GEq66WP3oa1O2LQWdM4FkwVG7AhuFQWE8ERV oDLsRxB9EoSCeciJJGI+Ln8eKKOz/RaGuv3nUvZaEMG0nDDy9jEp+MYzmbtQuASYg+OBa7 yosmIcugbcNw37I+OS0T9MTmq6DQsuAHLfUGhqf3bGn24Pft1yJi8oLw5SQum+ZspcDFi7 JNjYYUrCstZ6tbDUt6kBKXLCBBpagPPS/bTNCBCFCKtafwd3597HH9arMCaLPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645081; a=rsa-sha256; cv=none; b=H73jpiSxWhSbIrcjIHTqqmNFMMDuIfSczU0u/HB0Ux3TBD4IDOgOkRhslaoQ3DHjSuAaYM FwxGQWkRZfouwYa4nnItC0Y/9PoxgJ0/8y5w4aEQ3Jezs8LeYcGcj6YAmXR7H1tBZhZ/N/ ZdopdAF9L3p5YPZ5AdVLGc6hLCUei3z9dPm3na+pRkhkY4EO78BezXq9GOjqlAU1HQhxLd DlqkziWWtheicv/RkWFH159q/McDcQGJFs+6ZB6BlOay5PrWn/Y+ZxGtGCA2/aK7t/iwV5 2iOQi5KG9UsByKL6i2sn2MKSUK7QcwVxyQ5/VO+GDGR5qkTnFpjuBapk1WD13g== 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 4NtvZJ6bT2zMv2; Fri, 13 Jan 2023 21:24:40 +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 30DLOeXE040347; Fri, 13 Jan 2023 21:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOeVt040346; Fri, 13 Jan 2023 21:24:40 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:40 GMT Message-Id: <202301132124.30DLOeVt040346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 1c915de99108 - stable/13 - change_mpath_route: Remove write-only nh variable. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c915de99108487f58f338ddf1287bda489cb73f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=1c915de99108487f58f338ddf1287bda489cb73f commit 1c915de99108487f58f338ddf1287bda489cb73f Author: John Baldwin AuthorDate: 2022-04-06 23:45:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:25 +0000 change_mpath_route: Remove write-only nh variable. While here, cleanup the style of the function prologue by moving an assignment out of the middle of two variable declaration blocks. (cherry picked from commit f7236dd0684e0a523f2b19b187b5ae3b558de4f2) --- sys/net/route/route_ctl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 890a25b5f546..afe0a024b832 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -1000,15 +1000,12 @@ change_mpath_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, *nh_new; + struct nhop_object *nh_orig, *nh_new; struct route_nhop_data rnd_new; - - nh = NULL; - nh_orig = rnd_orig->rnd_nhop; - struct weightened_nhop *wn = NULL, *wn_new; uint32_t num_nhops; + nh_orig = rnd_orig->rnd_nhop; wn = nhgrp_get_nhops((struct nhgrp_object *)nh_orig, &num_nhops); nh_orig = NULL; for (int i = 0; i < num_nhops; i++) {