From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCkAT-00028u-7g for qemu-devel@nongnu.org; Tue, 14 Jun 2016 04:57:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCkAN-0001Dy-AI for qemu-devel@nongnu.org; Tue, 14 Jun 2016 04:57:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCkAN-0001Ds-2B for qemu-devel@nongnu.org; Tue, 14 Jun 2016 04:57:47 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9588981130 for ; Tue, 14 Jun 2016 08:57:46 +0000 (UTC) From: Markus Armbruster References: <1465855078-19435-1-git-send-email-ehabkost@redhat.com> <1465855078-19435-4-git-send-email-ehabkost@redhat.com> Date: Tue, 14 Jun 2016 10:57:44 +0200 In-Reply-To: <1465855078-19435-4-git-send-email-ehabkost@redhat.com> (Eduardo Habkost's message of "Mon, 13 Jun 2016 18:57:58 -0300") Message-ID: <87d1nkkv07.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v3 3/3] coccinelle: Remove unnecessary variables for function return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org Eduardo Habkost writes: > Use Coccinelle script to replace 'ret = E; return ret' with > 'return E'. The script will do the substitution only when the > function return type and variable type are the same. > > Sending as RFC because the patch looks more intrusive than the > others. Probably better to split it per subsystem and let each > maintainer review and apply it? I guess you forgot to drop this paragraph. Can do it on commit to error-next. > Manual fixups: > > * audio/audio.c: coding style of "read (...)" and "write (...)" > * block/qcow2-cluster.c: wrap line to make it shorter > * block/qcow2-refcount.c: change indentation of wrapped line > * target-tricore/op_helper.c: fix coding style of > "remainder|quotient" > * target-mips/dsp_helper.c: reverted changes because I don't > want to argue about checkpatch.pl > * ui/qemu-pixman.c: fix line indentation > * block/rbd.c: restore blank line between declarations and > statements > > Reviewed-by: Eric Blake > Signed-off-by: Eduardo Habkost [...] > diff --git a/scripts/coccinelle/return_directly.cocci b/scripts/coccinelle/return_directly.cocci > new file mode 100644 > index 0000000..c52f4fc > --- /dev/null > +++ b/scripts/coccinelle/return_directly.cocci > @@ -0,0 +1,21 @@ > +// replace 'R = X; return R;' with 'return R;' > + > +// remove assignment Second comment feels redundant. Can drop on commit to error-next. > +@ removal @ Rule name "removal" is not used. Can drop on commit to error-next. > +identifier VAR; > +expression E; > +type T; > +identifier F; > +@@ > + T F(...) > + { > + ... > +- T VAR; > + ... when != VAR > + > +- VAR = > ++ return > + E; > +- return VAR; > + ... when != VAR > + } [...] > diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c > index b04bfaf..afc8d6b 100644 > --- a/block/qcow2-cluster.c > +++ b/block/qcow2-cluster.c > @@ -154,11 +154,8 @@ static int l2_load(BlockDriverState *bs, uint64_t l2_offset, > uint64_t **l2_table) > { > BDRVQcow2State *s = bs->opaque; > - int ret; > - I'd prefer to keep this blank line. Can touch up on commit to error-next. > - ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset, (void**) l2_table); > - > - return ret; > + return qcow2_cache_get(bs, s->l2_table_cache, l2_offset, > + (void **) l2_table); > } > > /* [...]