From nobody Wed Dec 29 16:03:57 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 32707191B310; Wed, 29 Dec 2021 16:03:58 +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 4JPGRd6P3Xz4XQM; Wed, 29 Dec 2021 16:03:57 +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 BCC1427972; Wed, 29 Dec 2021 16:03:57 +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 1BTG3vwV028104; Wed, 29 Dec 2021 16:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTG3v1F028103; Wed, 29 Dec 2021 16:03:57 GMT (envelope-from git) Date: Wed, 29 Dec 2021 16:03:57 GMT Message-Id: <202112291603.1BTG3v1F028103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 84a071479253 - stable/13 - fw_stub: fix -Wunused-but-set-variable for firmware files 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84a071479253dd525099e403164313f36aec3d79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640793837; 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=Is25JauDV9fez17bNfekRQcSnn2vYN/P882dSTYNrMs=; b=FKovMkk9Qvd7lda3eTFAoGCSLKAu7VSMQgA0ZdxcwwJ1FlkC/rAYynC3f5V/4QYijL2tt9 VnOOZwAz8YecX2nyqmjr2b8a2UcqpBYzCVrR9BYw41ZMyqrQZkVyy69L+uiFmNfBfqr08f 4MDmoeWg13NqUUVj7gUcs9cy/0m6Z4IAj4TSqOVpQhlFdvGMlabQcK22asgphuiwBXgPlU LEnJgqv5GWR2i4T+xbpVTPKN/GrNUg7znDhZ2D6M6Odnp1QMIkpz/apXoIJ2PvoHyWRKPE 4HAjHnoHNPjNNeBFu1MAfc5+cZnpAlyZMSIaTr/q66/AjwxpvIbmHK5Nr6TR0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640793837; a=rsa-sha256; cv=none; b=egVL7SB3WghAc4dbQUnG/YcUgA8caNdzXgBsRUMl2qBopcIxvgoZs6mm8IRYMvjGy2ioJI 5D0QEbVOB1VtjHvQ2y92fHQ22X2dfyQfavAxXERE98k1G9eSo9Zqifaw9Pz2mpebkOWsLl ojL5IwbFjstfzaIJACiX4oBS+qo1W8llfuJDlwra8ab/2pVNDSIscwqE5FG+y9SKWvMJiy BWjOWXmiMtxj2Yn9yN4g9CgLPoyai/VrHs8yyQz7eU20aVFXAg/0s+6b2M1e5Sv+gQ0aOx BLYyS7QxvZL+zWEKKGGBG52SVoWNGqvE0/gPVuSK7EvhCiMweqFBKvaYTTG+jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=84a071479253dd525099e403164313f36aec3d79 commit 84a071479253dd525099e403164313f36aec3d79 Author: Bjoern A. Zeeb AuthorDate: 2021-11-30 14:23:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-12-29 16:02:07 +0000 fw_stub: fix -Wunused-but-set-variable for firmware files In case we are only embedding a single firmware image the variable "parent" gets set but never used. Add checks for the number of files for it and only print it out if we are exceeding the single file count. This fixes -Wunused-but-set-variable warnings for the majority of firmware files in the tree. Sponsored by: The FreeBSD Foundation (cherry picked from commit b394e16ef0b5ad0da5e029bcdd3a01e361724d8d) --- sys/tools/fw_stub.awk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk index 807c51b6190b..94975687f4e2 100644 --- a/sys/tools/fw_stub.awk +++ b/sys/tools/fw_stub.awk @@ -151,8 +151,10 @@ for (file_i = 0; file_i < num_files; file_i++) { printc("\nstatic int\n"\ modname "_fw_modevent(module_t mod, int type, void *unused)\ {\ - const struct firmware *fp, *parent;\ - int error;\ + const struct firmware *fp;"); +if (num_files > 1) + printc("\tconst struct firmware *parent;"); +printc("\tint error;\ switch (type) {\ case MOD_LOAD:\n"); @@ -187,7 +189,7 @@ for (file_i = 0; file_i < num_files; file_i++) { printc("\t\tif (fp == NULL)"); printc("\t\t\tgoto fail_" file_i ";"); - if (file_i == 0) + if (file_i == 0 && num_files > 1) printc("\t\tparent = fp;"); }