From nobody Tue Oct 28 02:10:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516115536176444.40760827770896; Tue, 16 Jan 2018 07:12:16 -0800 (PST) Received: from localhost ([::1]:39782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebSuH-0006J3-OU for importer@patchew.org; Tue, 16 Jan 2018 10:12:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebS4O-0003P6-6y for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebS4N-0005D4-58 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:32 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebS4M-0005Bk-Th for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:18:31 -0500 Received: by mail-wr0-x241.google.com with SMTP id 16so15333431wry.12 for ; Tue, 16 Jan 2018 06:18:30 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id u10sm1537758wrg.6.2018.01.16.06.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:18:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RiK3qZBbW+2OFHwPu12KyhpX4+dLD1fHntp4Gc1Ok3Q=; b=bZNAY6ptYvS93yzn2Wo8wHhO+Mze0S9gEgiiDfZvoNvvAify7sbtq8jjjWKb9LTDMt OsgxmdwxEvwUWgshIz9c4LKzYnEyli278RMwUUs1H/6MV/eZl0w5EDGbfAPko3A3oVPg uwXLvvR/CvKU92GzRbZ1zlsSH+ppl9EcCtOi/dgHGu98GczV/RjHSPIdS1mddj7TF26d EvpVjJu4Th8Kocoupw7lfozKwH82JevjktYCXTx6Tbnus/QgLH9EcXb+LhFioZMyAf4H nv+ZJ+TMqqUm+/b5W2JN3iRQmnC0cJge2OSJyyADSOFb1QaHtH5G4E9obxA6m3hkhJCv KXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=RiK3qZBbW+2OFHwPu12KyhpX4+dLD1fHntp4Gc1Ok3Q=; b=R9k1+TPdlwt3LNEfjOKAoa18EZwph6m/42qlJTm2Vr7Pk2WqUOKIL3TpsQX7R5Dtqa oauAXHZOdreAEOQXCRYWQn8F6B/354N6gFM/YLehp0g8wCENy0OxCBkusOyF/Hg428NH E8cPXT3g0nuSsYsyJZjR/fLJ7T2mgUB4ygXaCcTBte9uqZc/Ms87QLFZAnMGJ3f85bvb uR5374Lm7qU9JaJq5f4zU2ovnX/kzoLEj9lrBQpYR0xCjuOdYc15oeEYQgto1nMFOHMh x8PzFSf72/XsNBb7zXfAH8aUQffA5JM4kNgmWuH97F0p+clXmG2Y4Oz4zvDGrJb+cZTg 9DEA== X-Gm-Message-State: AKwxytfOQB8Bg0ZUSgzlESm8oBwwzGqavD9/7EP4Yvu1ZcZPPaH3DKLT ZSonVdSLv0XdRws21xUeGyvstKV7 X-Google-Smtp-Source: ACJfBosePTBwUD7VqBN7hUK8GpHI6RiY6fPoRRsK/icplfJAy+NlbVgRlRhg8W9/PRWu/u4g7Vtaiw== X-Received: by 10.223.135.59 with SMTP id a56mr16844601wra.121.1516112309556; Tue, 16 Jan 2018 06:18:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 15:17:20 +0100 Message-Id: <1516112253-14480-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> References: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 38/51] net: Drop unusual use of do { } while (0); X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake For a couple of macros in pcnet.c, we have to provide a new scope to avoid compiler warnings about declarations in the middle of a switch statement that aren't in a sub-scope. But use of 'do { ... } while (0);' merely to provide that new scope is arcane overkill, compared to just using '{ ... }'. Signed-off-by: Eric Blake Reviewed-by: Thomas Huth Message-Id: <20171201232433.25193-2-eblake@redhat.com> Signed-off-by: Paolo Bonzini --- hw/net/pcnet.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 39d5d93..606b05c 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -456,32 +456,32 @@ static inline void pcnet_rmd_store(PCNetState *s, str= uct pcnet_RMD *rmd, #define CHECK_RMD(ADDR,RES) do { \ switch (BCR_SWSTYLE(s)) { \ case 0x00: \ - do { \ + { \ uint16_t rda[4]; \ s->phys_mem_read(s->dma_opaque, (ADDR), \ (void *)&rda[0], sizeof(rda), 0); \ (RES) |=3D (rda[2] & 0xf000)!=3D0xf000; \ (RES) |=3D (rda[3] & 0xf000)!=3D0x0000; \ - } while (0); \ + } \ break; \ case 0x01: \ case 0x02: \ - do { \ + { \ uint32_t rda[4]; \ s->phys_mem_read(s->dma_opaque, (ADDR), \ (void *)&rda[0], sizeof(rda), 0); \ (RES) |=3D (rda[1] & 0x0000f000L)!=3D0x0000f000L; \ (RES) |=3D (rda[2] & 0x0000f000L)!=3D0x00000000L; \ - } while (0); \ + } \ break; \ case 0x03: \ - do { \ + { \ uint32_t rda[4]; \ s->phys_mem_read(s->dma_opaque, (ADDR), \ (void *)&rda[0], sizeof(rda), 0); \ (RES) |=3D (rda[0] & 0x0000f000L)!=3D0x00000000L; \ (RES) |=3D (rda[1] & 0x0000f000L)!=3D0x0000f000L; \ - } while (0); \ + } \ break; \ } \ } while (0) @@ -489,22 +489,22 @@ static inline void pcnet_rmd_store(PCNetState *s, str= uct pcnet_RMD *rmd, #define CHECK_TMD(ADDR,RES) do { \ switch (BCR_SWSTYLE(s)) { \ case 0x00: \ - do { \ + { \ uint16_t xda[4]; \ s->phys_mem_read(s->dma_opaque, (ADDR), \ (void *)&xda[0], sizeof(xda), 0); \ (RES) |=3D (xda[2] & 0xf000)!=3D0xf000; \ - } while (0); \ + } \ break; \ case 0x01: \ case 0x02: \ case 0x03: \ - do { \ + { \ uint32_t xda[4]; \ s->phys_mem_read(s->dma_opaque, (ADDR), \ (void *)&xda[0], sizeof(xda), 0); \ (RES) |=3D (xda[1] & 0x0000f000L)!=3D0x0000f000L; \ - } while (0); \ + } \ break; \ } \ } while (0) --=20 1.8.3.1