From nobody Wed Nov 27 10:37:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699868274; cv=none; d=zohomail.com; s=zohoarc; b=CMgiq3YK4UpP35WqC4Vl5dWtIICdUVGwa/x7q09CdzSxPmMgDTNY2SFYhe3V6PxffFCumdG33crPTM5A8sP2vWq3Ky58dczQ4DolXinTALlVljX6Tpk4Qze/QcJFIfH5brsR8X+xbhGL49QvgjwjlK/FXisG2Ps5tKij9dotF3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699868274; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aesQ6/07jaB1mqhaZf9GxawfJWuVxUiwCEukQxq61tw=; b=UoPXGweSmJ2D4LwpTNcsT2jQifVXSVn4bSeDHanwOCqqwARh//s3Old5RQFiCo4ROo1yln0rc286/AQvJRFq4gQ5L/YUwaNpYpRZA1WpspLfbH7IaFUUUWFbc9tj5d3002aADhwpwlFUwESzpM+3iC2A4zLMntBKDxeerQ07FWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699868274134187.00834431476312; Mon, 13 Nov 2023 01:37:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2TMv-0007x2-Ue; Mon, 13 Nov 2023 04:36:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2TMs-0007wQ-7A for qemu-devel@nongnu.org; Mon, 13 Nov 2023 04:36:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2TMp-0001xE-Sr for qemu-devel@nongnu.org; Mon, 13 Nov 2023 04:36:29 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-ozbJ9dZxPTms1wG4lbj7vg-1; Mon, 13 Nov 2023 04:36:23 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 186E528B72E3 for ; Mon, 13 Nov 2023 09:36:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EACA3492BFA for ; Mon, 13 Nov 2023 09:36:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E09EA21E6A26; Mon, 13 Nov 2023 10:36:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699868184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aesQ6/07jaB1mqhaZf9GxawfJWuVxUiwCEukQxq61tw=; b=Kif4lpRpz/ghbH+4CpCpajjFh8Wx9Q/xqv1UZGtiwN67nABOPX6rHUxdBAkfKZA8dm+aRl ox1orVBj9N+XNyeW64HW3OkQP1F6MTUPjUtC/re/w4NqqLaVLPwg11T4MEhXSQZ8hKGJTB X+OEX7b6iic5pxbyvT+mTqlfArbYHjM= X-MC-Unique: ozbJ9dZxPTms1wG4lbj7vg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Thomas Huth Subject: [PULL 1/2] block/snapshot: Fix compiler warning with -Wshadow=local Date: Mon, 13 Nov 2023 10:36:20 +0100 Message-ID: <20231113093621.750115-2-armbru@redhat.com> In-Reply-To: <20231113093621.750115-1-armbru@redhat.com> References: <20231113093621.750115-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1699868275739100003 Content-Type: text/plain; charset="utf-8" From: Thomas Huth No need to declare a new variable in the the inner code block here, we can re-use the "ret" variable that has been declared at the beginning of the function. With this change, the code can now be successfully compiled with -Wshadow=3Dlocal again. Signed-off-by: Thomas Huth Message-ID: <20231023175038.111607-1-thuth@redhat.com> Reviewed-by: Markus Armbruster [Commit message tweaked] Signed-off-by: Markus Armbruster --- block/snapshot.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/snapshot.c b/block/snapshot.c index 6e16eb803a..55974273ae 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -629,7 +629,6 @@ int bdrv_all_goto_snapshot(const char *name, while (iterbdrvs) { BlockDriverState *bs =3D iterbdrvs->data; AioContext *ctx =3D bdrv_get_aio_context(bs); - int ret =3D 0; bool all_snapshots_includes_bs; =20 aio_context_acquire(ctx); @@ -637,9 +636,8 @@ int bdrv_all_goto_snapshot(const char *name, all_snapshots_includes_bs =3D bdrv_all_snapshots_includes_bs(bs); bdrv_graph_rdunlock_main_loop(); =20 - if (devices || all_snapshots_includes_bs) { - ret =3D bdrv_snapshot_goto(bs, name, errp); - } + ret =3D (devices || all_snapshots_includes_bs) ? + bdrv_snapshot_goto(bs, name, errp) : 0; aio_context_release(ctx); if (ret < 0) { bdrv_graph_rdlock_main_loop(); --=20 2.41.0