From nobody Thu Dec 09 18:58:54 2021 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 EB2ED18C6AD8; Thu, 9 Dec 2021 18:58:55 +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 4J93Gl15M1z4TKw; Thu, 9 Dec 2021 18:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7EBD13CD0; Thu, 9 Dec 2021 18:58:54 +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 1B9IwsaS046056; Thu, 9 Dec 2021 18:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9Iwsj8046055; Thu, 9 Dec 2021 18:58:54 GMT (envelope-from git) Date: Thu, 9 Dec 2021 18:58:54 GMT Message-Id: <202112091858.1B9Iwsj8046055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d6110110bb9b - stable/13 - ipfilter: Save a word of stack space 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d6110110bb9bcd9d1aec7d0d3e3ee9b13eba3b78 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076335; 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=CB/CXQjQDvjrL7oVjQJ239TIWNN9TzCz074uUvw5pf0=; b=p+DPIvP8oKaWEfqs8sKax+7xPYTTuuhqX8H61ZiorV4qnIsPGrBCW4HMeZjfO/86W/eeyb BNO05BieTMDBNIc91m+Ni9RKQwOnkMDtCVc16y22ZKcqms95PwRP+RietIdgsg6vwRMfQx ecFkJ70nSXGdK2MjR80h1UyOIgIkDt3ZTPKBoY0ZVh5C3TDm8G/keXjeoPPI7tM9ySiStI i+xwUHlN0wh/70CS3FdexM7LjvGhVtf1pqYh8bQI4j40xdrv+Tg9M2yqfya9aRp2pws4lu zwpO4jdOMISqO9c0IR44nIiI+DAbwTfGn5Ldyh3g9bUUW+IA344Zz3MhpBHThw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076335; a=rsa-sha256; cv=none; b=CUPRNApIN+2Mj4DZvLPBtttBNsGULPhnRwe9fRL6KklgdGq4Ed1D/eayoRlaa2l+i9eVzq OUO7+U7tILXIbUGsXLLmig4tz58fa+N7QmegpgP4o+vO9wKiGwZ0fmDK2/i684WTcOr7AX Wu1cGEIyCgmt+2g/16jr9s+YcJBg+DzbVGFZj15rDJLjUQ0Wl15bNMCvf0Cv5+FEKQ3ApO fvBx+hhRLiMAjD7kzEQrmJVSZsfWE7BO5K76dyb9unC16tSuxCfNGOgFv3tn2CV/WF+GSK Qa3cmOukp5AUSRtbT/U5Cqedo5LBoWBLKude1rkkOQ0alDBoX4NRnr3F9LU/Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d6110110bb9bcd9d1aec7d0d3e3ee9b13eba3b78 commit d6110110bb9bcd9d1aec7d0d3e3ee9b13eba3b78 Author: Cy Schubert AuthorDate: 2021-10-04 18:36:15 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:50:21 +0000 ipfilter: Save a word of stack space Rather than save the return code into an intermediate variable, which BTW is optimized out anyway, explicitly remove the return code from the stack. (cherry picked from commit b7f127b6e5f9febff895da9230c3269dfcd971c2) --- sys/contrib/ipfilter/netinet/ip_ftp_pxy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c index f4b40f3601d9..0079e884a8b8 100644 --- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c @@ -1258,15 +1258,13 @@ ipf_p_ftp_valid(softf, ftp, side, buf, len) size_t len; { ftpside_t *ftps; - int ret; ftps = &ftp->ftp_side[side]; if (side == 0) - ret = ipf_p_ftp_client_valid(softf, ftps, buf, len); + return(ipf_p_ftp_client_valid(softf, ftps, buf, len)); else - ret = ipf_p_ftp_server_valid(softf, ftps, buf, len); - return ret; + return(ipf_p_ftp_server_valid(softf, ftps, buf, len)); }