Compress lines for immediate return
PATCH v2 1/1 Compress lines for immediate return
Compress two lines into a single line if immediate return statement is found.
It also remove variables progress, val, data, ret and sock as they are no longer needed.
Remove space between function "mixer_load" and '(' to fix the checkpatch.pl error:-
ERROR: space prohibited between function name and open parenthesis '('
Done using following coccinelle script:
@@
local idexpression ret;
expression e;
@@
-ret =
+return
e;
-return ret;
---
Changes in v2:
-Added coccinelle script wrote for changes in commit message.
block/file-posix.c | 3 +-- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/cirrus_vga.c | 4 +--- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 10 files changed, 10 insertions(+), 28 deletions(-)
block/file-posix.c +1 -2
@@ -1627,8 +1627,7 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque)/* If we couldn't manage to unmap while guaranteed that the area reads as * all-zero afterwards, just write zeroes without unmapping */ - ret =handle_aiocb_write_zeroes (aiocb); -return ret; +return handle_aiocb_write_zeroes (aiocb); }#ifndef HAVE_COPY_FILE_RANGE
block/nfs.c +1 -2
@@ -623,8 +623,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags, } bs->total_sectors = ret; - ret =0 ; -return ret; +return 0 ; }static QemuOptsList nfs_create_opts = {
block/nvme.c +1 -3
@@ -575,11 +575,9 @@ static bool nvme_poll_cb(void *opaque) {EventNotifier *e = opaque;BDRVNVMeState *s =container_of (e, BDRVNVMeState, irq_notifier); -bool progress = false;trace_nvme_poll_cb (s); - progress =nvme_poll_queues (s); -return progress; +return nvme_poll_queues (s); } static int nvme_init(BlockDriverState *bs, const char *device, int namespace,
block/vhdx.c +1 -2
@@ -411,8 +411,7 @@ int vhdx_update_headers(BlockDriverState *bs, BDRVVHDXState *s,if (ret <0 ) {return ret; } - ret =vhdx_update_header (bs, s, generate_data_write_guid, log_guid); -return ret; +return vhdx_update_header (bs, s, generate_data_write_guid, log_guid); }/* opens the specified header block from the VHDX file header section */
hw/audio/ac97.c +1 -3
@@ -573,11 +573,9 @@ static uint32_t nam_readb (void *opaque, uint32_t addr)static uint32_t nam_readw (void *opaque,uint32_t addr) {AC97LinkState *s = opaque; -uint32_t val = ~0U ;uint32_t index = addr; s->cas =0 ; - val =mixer_load (s, index); -return val; +return mixer_load (s, index); }static uint32_t nam_readl (void *opaque,uint32_t addr)
hw/audio/adlib.c +1 -4
@@ -120,13 +120,10 @@ static void adlib_write(void *opaque, uint32_t nport, uint32_t val)static uint32_t adlib_read (void *opaque,uint32_t nport) {AdlibState *s = opaque; -uint8_t data;int a = nport &3 ;adlib_kill_timers (s); - data =OPLRead (s->opl, a); - -return data; +return OPLRead (s->opl, a); }static void timer_handler (void *opaque,int c,double interval_Sec)
hw/display/cirrus_vga.c +1 -3
@@ -2411,12 +2411,10 @@ static uint64_t cirrus_linear_bitblt_read(void *opaque, unsigned size) {CirrusVGAState *s = opaque; -uint32_t ret;/* XXX handle bitblt */ (void )s; - ret =0xff ; -return ret; +return 0xff ; } static void cirrus_linear_bitblt_write(void *opaque,
migration/ram.c +1 -3
@@ -2135,9 +2135,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) }trace_ram_postcopy_send_discard_bitmap (); - ret =postcopy_each_ram_send_discard (ms); - -return ret; +return postcopy_each_ram_send_discard (ms); }/**
ui/gtk.c +1 -2
@@ -1650,8 +1650,7 @@ static GSList *gd_vc_menu_init(GtkDisplayState *s, VirtualConsole *vc, G_CALLBACK(gd_menu_switch_vc), s);gtk_menu_shell_append (GTK_MENU_SHELL (view_menu), vc->menu_item); - group =gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (vc->menu_item)); -return group; +return gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (vc->menu_item)); }#if defined(CONFIG_VTE )
util/qemu-sockets.c +1 -4
@@ -765,15 +765,12 @@ static int vsock_connect_addr(const struct sockaddr_vm *svm, Error **errp)static int vsock_connect_saddr (VsockSocketAddress *vaddr,Error **errp) {struct sockaddr_vm svm; -int sock =-1 ;if (!vsock_parse_vaddr_to_sockaddr (vaddr, &svm, errp)) {return -1 ; } - sock =vsock_connect_addr (&svm, errp); - -return sock; +return vsock_connect_addr (&svm, errp); } static int vsock_listen_saddr(VsockSocketAddress *vaddr,
Signature · 1 line
2.17.1
Quoted 25 lines · Simran Singhal
Compress two lines into a single line if immediate return statement is found.
It also remove variables progress, val, data, ret and sock as they are no longer needed.
Remove space between function "
mixer_load" and '(' to fix the checkpatch.pl error:-
ERROR: space prohibited between function name and open parenthesis '('Done using following coccinelle script:
@@
local idexpression ret;
expression e;
@@(quoted diff) +1
-2-ret = +return e; -return ret;Signed-off-by Simran Singhal <[email protected]>---
Changes in v2:
-Added coccinelle script wrote for changes in commit message.
Quoted 11 lines
block/file-posix.c | 3 +-- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/cirrus_vga.c | 4 +--- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 10 files changed, 10 insertions(+), 28 deletions(-)
Laurent Vivier
AppliedLe 03/04/2020 à 14:53, Stefan Hajnoczi a écrit :
Quoted 26 lines · Simran Singhal
Quoted 25 lines
Compress two lines into a single line if immediate return statement is found.
It also remove variables progress, val, data, ret and sock as they are no longer needed.
Remove space between function "
mixer_load" and '(' to fix the checkpatch.pl error:-
ERROR: space prohibited between function name and open parenthesis '('Done using following coccinelle script:
@@
local idexpression ret;
expression e;
@@(quoted diff) +1
-2-ret = +return e; -return ret;Signed-off-by Simran Singhal <[email protected]>---
Changes in v2:
-Added coccinelle script wrote for changes in commit message.
Quoted 14 lines
Quoted 11 lines
block/file-posix.c | 3 +-- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/cirrus_vga.c | 4 +--- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 10 files changed, 10 insertions(+), 28 deletions(-)Reviewed-by Stefan Hajnoczi <[email protected]>
Applied to my trivial-patches branch.
Thanks,
Laurent