From nobody Wed May 15 13:09:14 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=1695400730; cv=none; d=zohomail.com; s=zohoarc; b=OWs/HWMgKr1uJcBvtztIXVOb23477NSRzXciQs/7puAP2nFfT8f18uVE38JubJM5OCX9mwIe4VVwumnQsjH5Lc2fTTeWN2U5wkxUViBXATJz8YjdGkVBCVCf4Xb5jf6xRMM+c/SJh+FDycEs337L4sUhz96N2mipmW5YTqtFg1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695400730; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8gd4cFIAWYh1CW4d+sE2sq/Yo8GMCugx0KOzDYlYGDg=; b=hDhDLIy7N3v81GGMDEzwCjg0ar0mgtdcRmH/nTmuvpkvDvYlPPU6Iur17j3eBmAU0FxVLGejk19EZTdc1CxKAb2YRiMhkkBTUlbLfBhVj7AIcUszi9vUo7PQ9Zfc7Wzkqka7q7tpsqJwmsDk7espEUmhuZg1FBv4XAi+2McOKY0= 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 169540073069291.22192930927474; Fri, 22 Sep 2023 09:38:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjjAG-0003fi-7X; Fri, 22 Sep 2023 12:38:01 -0400 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 1qjjA5-0003ee-6Y for qemu-devel@nongnu.org; Fri, 22 Sep 2023 12:37:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjjA3-0005Yw-KQ for qemu-devel@nongnu.org; Fri, 22 Sep 2023 12:37:48 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-dFbKnOuqPc-hFJpCPp55mg-1; Fri, 22 Sep 2023 12:37:44 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F140D3C13928; Fri, 22 Sep 2023 16:37:43 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id D87822904; Fri, 22 Sep 2023 16:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695400666; 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; bh=8gd4cFIAWYh1CW4d+sE2sq/Yo8GMCugx0KOzDYlYGDg=; b=cyn6xbgyhvdQbRY2t19IW/kTWUCBSq+HBpOMB/5j/6u8df9sIIU8FPvk6UPVhKERRD+JAN Pn2lrfZqDvPqYjo4QA+Amk0B587siWzaD4D+Llm8f1oD6miaN5Zjt0e5cVw/tQX2y9Imlq RwXYUPKF1A5j4tem2KF5YJ2EqYVB56M= X-MC-Unique: dFbKnOuqPc-hFJpCPp55mg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] tests/qtest/m48t59-test: Silence compiler warning with -Wshadow Date: Fri, 22 Sep 2023 18:37:42 +0200 Message-ID: <20230922163742.149444-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1695400731532100003 When compiling this file with -Wshadow=3Dlocal , we get: ../tests/qtest/m48t59-test.c: In function =E2=80=98bcd_check_time=E2=80=99: ../tests/qtest/m48t59-test.c:195:17: warning: declaration of =E2=80=98s=E2= =80=99 shadows a previous local [-Wshadow=3Dlocal] 195 | long t, s; | ^ ../tests/qtest/m48t59-test.c:158:17: note: shadowed declaration is here 158 | QTestState *s =3D m48t59_qtest_start(); | ^ Rename the QTestState variable to "qts" which is the common naming for such a variable in other tests. Reported-by: Markus Armbruster Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/m48t59-test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c index 843d2ced8e..9487faff1a 100644 --- a/tests/qtest/m48t59-test.c +++ b/tests/qtest/m48t59-test.c @@ -155,7 +155,7 @@ static void bcd_check_time(void) struct tm *datep; time_t ts; const int wiggle =3D 2; - QTestState *s =3D m48t59_qtest_start(); + QTestState *qts =3D m48t59_qtest_start(); =20 /* * This check assumes a few things. First, we cannot guarantee that w= e get @@ -173,10 +173,10 @@ static void bcd_check_time(void) ts =3D time(NULL); gmtime_r(&ts, &start); =20 - cmos_get_date_time(s, &date[0]); - cmos_get_date_time(s, &date[1]); - cmos_get_date_time(s, &date[2]); - cmos_get_date_time(s, &date[3]); + cmos_get_date_time(qts, &date[0]); + cmos_get_date_time(qts, &date[1]); + cmos_get_date_time(qts, &date[2]); + cmos_get_date_time(qts, &date[3]); =20 ts =3D time(NULL); gmtime_r(&ts, &end); @@ -207,7 +207,7 @@ static void bcd_check_time(void) g_assert_cmpint(ABS(t - s), <=3D, wiggle); } =20 - qtest_quit(s); + qtest_quit(qts); } =20 /* success if no crash or abort */ --=20 2.41.0