OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Avoid returning void 

It's silly and non-conforming to standards to return void,
don't do it.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2012-07-08 06:56:53 +00:00
parent 16fd921bd3
commit 0ed8b6f67f
12 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block.c
View File

@ -2609,7 +2609,7 @@ void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event)
return; return;
} }
return drv->bdrv_debug_event(bs, event); drv->bdrv_debug_event(bs, event);
} }

6
dma.h
View File

@ -196,9 +196,9 @@ static inline void dma_memory_unmap(DMAContext *dma,
DMADirection dir, dma_addr_t access_len) DMADirection dir, dma_addr_t access_len)
{ {
if (!dma_has_iommu(dma)) { if (!dma_has_iommu(dma)) {
return cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len, cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len,
dir == DMA_DIRECTION_FROM_DEVICE, dir == DMA_DIRECTION_FROM_DEVICE,
access_len); access_len);
} else { } else {
iommu_dma_memory_unmap(dma, buffer, len, dir, access_len); iommu_dma_memory_unmap(dma, buffer, len, dir, access_len);
} }

11
hw/bt-l2cap.c
View File

@ -1000,7 +1000,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
/* TODO: Signal an error? */ /* TODO: Signal an error? */
return; 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 */ 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) if (len - 4 > ch->mps)
goto len_error; 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: case L2CAP_SAR_START:
if (ch->len_total || len < 6) 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; goto len_error;
memcpy(ch->sdu + ch->len_cur, hdr->data + 2, len - 4); 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: case L2CAP_SAR_CONT:
if (!ch->len_total || ch->len_cur + len - 4 >= ch->len_total) 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; struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parms;
return l2cap_pdu_submit(chan->l2cap); l2cap_pdu_submit(chan->l2cap);
} }
#if 0 #if 0

15
hw/eepro100.c
View File

@ -1596,10 +1596,17 @@ static void eepro100_write(void *opaque, target_phys_addr_t addr,
EEPRO100State *s = opaque; EEPRO100State *s = opaque;
switch (size) { switch (size) {
case 1: return eepro100_write1(s, addr, data); case 1:
case 2: return eepro100_write2(s, addr, data); eepro100_write1(s, addr, data);
case 4: return eepro100_write4(s, addr, data); break;
default: abort(); case 2:
eepro100_write2(s, addr, data);
break;
case 4:
eepro100_write4(s, addr, data);
break;
default:
abort();
} }
} }

6
hw/ide/cmd646.c
View File

@ -94,12 +94,12 @@ static void cmd646_data_write(void *opaque, target_phys_addr_t addr,
CMD646BAR *cmd646bar = opaque; CMD646BAR *cmd646bar = opaque;
if (size == 1) { if (size == 1) {
return ide_ioport_write(cmd646bar->bus, addr, data); ide_ioport_write(cmd646bar->bus, addr, data);
} else if (addr == 0) { } else if (addr == 0) {
if (size == 2) { if (size == 2) {
return ide_data_writew(cmd646bar->bus, addr, data); ide_data_writew(cmd646bar->bus, addr, data);
} else { } else {
return ide_data_writel(cmd646bar->bus, addr, data); ide_data_writel(cmd646bar->bus, addr, data);
} }
} }
} }

3
hw/ide/piix.c
View File

@ -73,7 +73,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr,
#endif #endif
switch(addr & 3) { switch(addr & 3) {
case 0: case 0:
return bmdma_cmd_writeb(bm, val); bmdma_cmd_writeb(bm, val);
break;
case 2: case 2:
bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06);
break; break;

3
hw/ide/via.c
View File

@ -74,7 +74,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr,
#endif #endif
switch (addr & 3) { switch (addr & 3) {
case 0: case 0:
return bmdma_cmd_writeb(bm, val); bmdma_cmd_writeb(bm, val);
break;
case 2: case 2:
bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06);
break; break;

6
hw/lan9118.c
View File

@ -1166,9 +1166,11 @@ static void lan9118_16bit_mode_write(void *opaque, target_phys_addr_t offset,
{ {
switch (size) { switch (size) {
case 2: case 2:
return lan9118_writew(opaque, offset, (uint32_t)val); lan9118_writew(opaque, offset, (uint32_t)val);
return;
case 4: 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); hw_error("lan9118_write: Bad size 0x%x\n", size);

8
hw/ne2000.c
View File

@ -677,15 +677,15 @@ static void ne2000_write(void *opaque, target_phys_addr_t addr,
NE2000State *s = opaque; NE2000State *s = opaque;
if (addr < 0x10 && size == 1) { if (addr < 0x10 && size == 1) {
return ne2000_ioport_write(s, addr, data); ne2000_ioport_write(s, addr, data);
} else if (addr == 0x10) { } else if (addr == 0x10) {
if (size <= 2) { if (size <= 2) {
return ne2000_asic_ioport_write(s, addr, data); ne2000_asic_ioport_write(s, addr, data);
} else { } else {
return ne2000_asic_ioport_writel(s, addr, data); ne2000_asic_ioport_writel(s, addr, data);
} }
} else if (addr == 0x1f && size == 1) { } else if (addr == 0x1f && size == 1) {
return ne2000_reset_ioport_write(s, addr, data); ne2000_reset_ioport_write(s, addr, data);
} }
} }

9
hw/vmware_vga.c
View File

@ -1150,11 +1150,14 @@ static void vmsvga_io_write(void *opaque, target_phys_addr_t addr,
switch (addr) { switch (addr) {
case SVGA_IO_MUL * SVGA_INDEX_PORT: 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: 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: case SVGA_IO_MUL * SVGA_BIOS_PORT:
return vmsvga_bios_write(s, addr, data); vmsvga_bios_write(s, addr, data);
break;
} }
} }

3
ui/vnc-auth-vencrypt.c
View File

@ -47,7 +47,8 @@ static void start_auth_vencrypt_subauth(VncState *vs)
case VNC_AUTH_VENCRYPT_TLSSASL: case VNC_AUTH_VENCRYPT_TLSSASL:
case VNC_AUTH_VENCRYPT_X509SASL: case VNC_AUTH_VENCRYPT_X509SASL:
VNC_DEBUG("Start TLS auth SASL\n"); VNC_DEBUG("Start TLS auth SASL\n");
return start_auth_sasl(vs); start_auth_sasl(vs);
break;
#endif /* CONFIG_VNC_SASL */ #endif /* CONFIG_VNC_SASL */
default: /* Should not be possible, but just in case */ default: /* Should not be possible, but just in case */

2
ui/vnc.c
View File

@ -3089,5 +3089,5 @@ void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
{ {
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
return vnc_connect(vs, csock, skipauth); vnc_connect(vs, csock, skipauth);
} }