From nobody Thu Dec 09 19:00:16 2021 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 58D5318C84EE; Thu, 9 Dec 2021 19:00:17 +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 4J93JJ4h7qz4Tpn; Thu, 9 Dec 2021 19:00:16 +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 743AA42AE; Thu, 9 Dec 2021 19:00:16 +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 1B9J0GLq053398; Thu, 9 Dec 2021 19:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9J0G3w053392; Thu, 9 Dec 2021 19:00:16 GMT (envelope-from git) Date: Thu, 9 Dec 2021 19:00:16 GMT Message-Id: <202112091900.1B9J0G3w053392@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: c735ca3b1f8c - stable/12 - ipfilter: Save a word of stack space 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c735ca3b1f8c839b40fb6d92742a211c006f5b90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076416; 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=kOU2xInjETk1ZDhZXXVLA/F1ndxIK980DMl8IqjteW0=; b=o0mBK6M7RrnlSSXhsUw044/OF5rojPIBfVhLIB4yo0/Ch0+1Ky0aY6y1vJAlXy14FCcQ9b te0r84AlBBAmjV/LSSgBGQ0C0KWB6LYdX/+4+lZCSs0CLhfHQjTU3nSk6LVS/P0c/KCtMy PsZW1RfkQmG5VCU2G9at9mDCeVqp6bURE/oz6MRVdSccsK/Bkii2xca1MRnRfLuvy41RO+ PZhmvlaIDA2bJkwUhQ6EtF7aiKNxHgXHciMh6Thh/HaVWirdkBuSCX1LjQm5e/ceECsmrc amM9kj512p1fMu6lgSIZFDf0bVvKmvRo2Ho0/88YgLRx/KLghJDRFj5TwU90Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076416; a=rsa-sha256; cv=none; b=CGTxJqG4w8yNyEjrL8Lez4bVHmx9U6N0muxOk+1nKGLukAQ3RJ+NE90wt0a99SshU0JJUU qKLZ89dNMD/mAlsNgl7BEzo9vcejGTUTWDI412yn1A1qA5nf21WQMtWdOimFDIBmcDMOcK 4yk9d1dxhKZYBOLUgyBOaxbdbStju/SY1z5skXsla6wvetcBVoW8H7fx5flgP2PZNBGrc8 cbQY23Q1LORvGQ2MrjuGSCKtNsRZW4vEj0V/gEonb+UlyeyTts2ClRH57WcQDN6R40A5C6 zrA08SEsIO1AHgnR5G6xyXiuMY4GiW+s8/ck/DQCfy9fiIToNV7QylitEZi94A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c735ca3b1f8c839b40fb6d92742a211c006f5b90 commit c735ca3b1f8c839b40fb6d92742a211c006f5b90 Author: Cy Schubert AuthorDate: 2021-10-04 18:36:15 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:52:10 +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)); }