From nobody Sat Dec 04 14:34:33 2021 X-Original-To: dev-commits-src-main@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 85B1518B7A4D; Sat, 4 Dec 2021 14:34:33 +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 4J5sf120cmz3DcK; Sat, 4 Dec 2021 14:34:33 +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 248B426108; Sat, 4 Dec 2021 14:34:33 +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 1B4EYXBU077848; Sat, 4 Dec 2021 14:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4EYXjT077847; Sat, 4 Dec 2021 14:34:33 GMT (envelope-from git) Date: Sat, 4 Dec 2021 14:34:33 GMT Message-Id: <202112041434.1B4EYXjT077847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b7f127b6e5f9 - main - ipfilter: Save a word of stack space List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b7f127b6e5f9febff895da9230c3269dfcd971c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638628473; 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=Vr/iaocYySms9+8EJOICt9pDwb6z8o0tDeWHdZl29oo=; b=CRCNAAHMRwN61vlB7vmcoMGvufW1BsmcYsJL+pnZ2/CnVzcFpDbiNWFMDmnDBYLQr3YRMK 2bqpdh0ZRNMCHzMAydB0JSU6KIrgf55egvdhACE1CWUWBUM9ad4LirGaoFQitS4WEZx7Z/ Mr5i0edjK6eFchxEbC9RZX0YlbViQhLctyX5YnMMTXsth+UH0Wu7jRW0H8+w+W3GOPLtGS +AjSoe3KtNAaeMOLzY7BWphVSUb7ZiTcS7Z2tk9YTo1Nvaipb2jeVkOwP06wsQGYvRqMwE KF60MigSKif9nBTGOTcmbWEIXVGH90TcVz3CKmawHYoDfNiNKBBdHmm35PW4jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638628473; a=rsa-sha256; cv=none; b=RJZW0iK+xd1XTLGI+nPmppQfcv8XPIEKoJ3mVFtgmSJEAa4PjK23oIEquF6Bq9j+oYzq97 QFnqY3uJ0aP1naJD3Rsf98rx5omrFXMoShn/wQByyanSDiRS690fuJz+l4QRQVUKivtgbP NIwBfOXn4eurTHB+8PmBtvPrb5CFe2AgCAZe7jwnbzz1N944Y7Rf5tvHUQwy7Fx2EBdG94 /alcDIPhTc6adHDY9P+mLXbohwtkLdcZ1q3i+ykNSi6wh1+YAwoT2pLiNplbnc5PP30pwh Ga8+u4xkrPB2RjYRuEkmummJ6WkRto76O6iUJgA1qdIqsfzBVdTcyYlgLWnmhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f127b6e5f9febff895da9230c3269dfcd971c2 commit b7f127b6e5f9febff895da9230c3269dfcd971c2 Author: Cy Schubert AuthorDate: 2021-10-04 18:36:15 +0000 Commit: Cy Schubert CommitDate: 2021-12-04 14:33:12 +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. MFC after: 3 days --- 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)); }