From patchwork Sat Jul 14 13:04:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 171002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B61D42C00DA for ; Sat, 14 Jul 2012 23:04:48 +1000 (EST) Received: from localhost ([::1]:34190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21e-0000GT-O5 for incoming@patchwork.ozlabs.org; Sat, 14 Jul 2012 09:04:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21O-00007Z-LL for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sq21N-0005m2-53 for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:30 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:38576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sq21M-0005lg-Rg for qemu-devel@nongnu.org; Sat, 14 Jul 2012 09:04:29 -0400 Received: by mail-ey0-f173.google.com with SMTP id k12so1503006eaa.4 for ; Sat, 14 Jul 2012 06:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=LBRwwsgKijk3kffsr8D3mMkgeejlJ50HsKW+wnLJw0w=; b=eMCiDvQYaeMHiimQcMx5lNv8IhYQT2+lSn9CbG50U66jmimo5+PRLY5jpCdJwy+3Cc EJnmyYq7hnCxyxbPAIv4FzNWzP5VOaW8Xa8ikMrQiw51jIHqfn1lUiYSRgKXJ9APX8/K huRIYaVmGbF/hcgsRe0vjHsn71oRvhMe8k4v3x9alNkBBJx409i1V08S6BSW3GV45xgV xARXQgUamfTU07sI9071gTHEC90hn8TOc1xw64PVUVDu0B0R4LuV6egMfAaD9UZmD4Zi gE9JP+ve+N4dSuUQLvg6wL91aSSU4jp1uQRMM22m26cUEI81YCZVD8fvB0MlHmowdqtp D1iA== Received: by 10.14.176.133 with SMTP id b5mr2028288eem.37.1342271068473; Sat, 14 Jul 2012 06:04:28 -0700 (PDT) Received: from localhost.localdomain (blueswirl.broker.freenet6.net. [2001:5c0:1400:b::d5a3]) by mx.google.com with ESMTPS id j4sm3761273eeo.11.2012.07.14.06.04.26 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 Jul 2012 06:04:27 -0700 (PDT) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sat, 14 Jul 2012 13:04:51 +0000 Message-Id: <512bc8abb46d80b2be765cc78fdf9b420dc33194.1342270877.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.173 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH v3 1/2] Avoid returning void X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's silly and non-conforming to standards to return void, don't do it. Signed-off-by: Blue Swirl --- block.c | 2 +- dma.h | 6 +++--- hw/bt-l2cap.c | 11 +++++++---- hw/eepro100.c | 15 +++++++++++---- hw/ide/cmd646.c | 6 +++--- hw/ide/piix.c | 3 ++- hw/ide/via.c | 3 ++- hw/lan9118.c | 6 ++++-- hw/ne2000.c | 8 ++++---- hw/vmware_vga.c | 9 ++++++--- ui/vnc-auth-vencrypt.c | 3 ++- ui/vnc.c | 2 +- 12 files changed, 46 insertions(+), 28 deletions(-) diff --git a/block.c b/block.c index 0c923f2..7ff7a67 100644 --- a/block.c +++ b/block.c @@ -2863,7 +2863,7 @@ void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event) return; } - return drv->bdrv_debug_event(bs, event); + drv->bdrv_debug_event(bs, event); } diff --git a/dma.h b/dma.h index acacf1b..f35c4b6 100644 --- a/dma.h +++ b/dma.h @@ -196,9 +196,9 @@ static inline void dma_memory_unmap(DMAContext *dma, DMADirection dir, dma_addr_t access_len) { if (!dma_has_iommu(dma)) { - return cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len, - dir == DMA_DIRECTION_FROM_DEVICE, - access_len); + cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len, + dir == DMA_DIRECTION_FROM_DEVICE, + access_len); } else { iommu_dma_memory_unmap(dma, buffer, len, dir, access_len); } diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c index 2ccba60..cb43ee7 100644 --- a/hw/bt-l2cap.c +++ b/hw/bt-l2cap.c @@ -1000,7 +1000,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid, /* TODO: Signal an error? */ return; } - return l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data)); + l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data)); + return; } switch (hdr->data[1] >> 6) { /* SAR */ @@ -1010,7 +1011,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid, if (len - 4 > ch->mps) goto len_error; - return ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4); + ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4); + break; case L2CAP_SAR_START: if (ch->len_total || len < 6) @@ -1033,7 +1035,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid, goto len_error; memcpy(ch->sdu + ch->len_cur, hdr->data + 2, len - 4); - return ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total); + ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total); + break; case L2CAP_SAR_CONT: if (!ch->len_total || ch->len_cur + len - 4 >= ch->len_total) @@ -1136,7 +1139,7 @@ static void l2cap_bframe_submit(struct bt_l2cap_conn_params_s *parms) { struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parms; - return l2cap_pdu_submit(chan->l2cap); + l2cap_pdu_submit(chan->l2cap); } #if 0 diff --git a/hw/eepro100.c b/hw/eepro100.c index 6279ae3..0f1f0f4 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1596,10 +1596,17 @@ static void eepro100_write(void *opaque, target_phys_addr_t addr, EEPRO100State *s = opaque; switch (size) { - case 1: return eepro100_write1(s, addr, data); - case 2: return eepro100_write2(s, addr, data); - case 4: return eepro100_write4(s, addr, data); - default: abort(); + case 1: + eepro100_write1(s, addr, data); + break; + case 2: + eepro100_write2(s, addr, data); + break; + case 4: + eepro100_write4(s, addr, data); + break; + default: + abort(); } } diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index bf8ece4..087b4f9 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -94,12 +94,12 @@ static void cmd646_data_write(void *opaque, target_phys_addr_t addr, CMD646BAR *cmd646bar = opaque; if (size == 1) { - return ide_ioport_write(cmd646bar->bus, addr, data); + ide_ioport_write(cmd646bar->bus, addr, data); } else if (addr == 0) { if (size == 2) { - return ide_data_writew(cmd646bar->bus, addr, data); + ide_data_writew(cmd646bar->bus, addr, data); } else { - return ide_data_writel(cmd646bar->bus, addr, data); + ide_data_writel(cmd646bar->bus, addr, data); } } } diff --git a/hw/ide/piix.c b/hw/ide/piix.c index f5a74c2..6652761 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -73,7 +73,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, #endif switch(addr & 3) { case 0: - return bmdma_cmd_writeb(bm, val); + bmdma_cmd_writeb(bm, val); + break; case 2: bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); break; diff --git a/hw/ide/via.c b/hw/ide/via.c index eec5136..a17f2e2 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -74,7 +74,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, #endif switch (addr & 3) { case 0: - return bmdma_cmd_writeb(bm, val); + bmdma_cmd_writeb(bm, val); + break; case 2: bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); break; diff --git a/hw/lan9118.c b/hw/lan9118.c index 7b4fe87..0c354e9 100644 --- a/hw/lan9118.c +++ b/hw/lan9118.c @@ -1166,9 +1166,11 @@ static void lan9118_16bit_mode_write(void *opaque, target_phys_addr_t offset, { switch (size) { case 2: - return lan9118_writew(opaque, offset, (uint32_t)val); + lan9118_writew(opaque, offset, (uint32_t)val); + return; case 4: - return lan9118_writel(opaque, offset, val, size); + lan9118_writel(opaque, offset, val, size); + return; } hw_error("lan9118_write: Bad size 0x%x\n", size); diff --git a/hw/ne2000.c b/hw/ne2000.c index d02e60c..ccf7715 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -677,15 +677,15 @@ static void ne2000_write(void *opaque, target_phys_addr_t addr, NE2000State *s = opaque; if (addr < 0x10 && size == 1) { - return ne2000_ioport_write(s, addr, data); + ne2000_ioport_write(s, addr, data); } else if (addr == 0x10) { if (size <= 2) { - return ne2000_asic_ioport_write(s, addr, data); + ne2000_asic_ioport_write(s, addr, data); } else { - return ne2000_asic_ioport_writel(s, addr, data); + ne2000_asic_ioport_writel(s, addr, data); } } else if (addr == 0x1f && size == 1) { - return ne2000_reset_ioport_write(s, addr, data); + ne2000_reset_ioport_write(s, addr, data); } } diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 476dc89..f5e4f44 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1150,11 +1150,14 @@ static void vmsvga_io_write(void *opaque, target_phys_addr_t addr, switch (addr) { case SVGA_IO_MUL * SVGA_INDEX_PORT: - return vmsvga_index_write(s, addr, data); + vmsvga_index_write(s, addr, data); + break; case SVGA_IO_MUL * SVGA_VALUE_PORT: - return vmsvga_value_write(s, addr, data); + vmsvga_value_write(s, addr, data); + break; case SVGA_IO_MUL * SVGA_BIOS_PORT: - return vmsvga_bios_write(s, addr, data); + vmsvga_bios_write(s, addr, data); + break; } } diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index 674ba97..c59b188 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -47,7 +47,8 @@ static void start_auth_vencrypt_subauth(VncState *vs) case VNC_AUTH_VENCRYPT_TLSSASL: case VNC_AUTH_VENCRYPT_X509SASL: VNC_DEBUG("Start TLS auth SASL\n"); - return start_auth_sasl(vs); + start_auth_sasl(vs); + break; #endif /* CONFIG_VNC_SASL */ default: /* Should not be possible, but just in case */ diff --git a/ui/vnc.c b/ui/vnc.c index cf1cae2..cfc61a7 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3089,5 +3089,5 @@ void vnc_display_add_client(DisplayState *ds, int csock, int skipauth) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; - return vnc_connect(vs, csock, skipauth); + vnc_connect(vs, csock, skipauth); }