From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH 5/7] libxc: Removing dead code from xc_dom_allocate() Date: Fri, 3 Jul 2015 15:41:09 +0100 Message-ID: <55969F05.3030807@citrix.com> References: <1435772232-39085-1-git-send-email-Jennifer.Herbert@citrix.com> <1435772232-39085-6-git-send-email-Jennifer.Herbert@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1435772232-39085-6-git-send-email-Jennifer.Herbert@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jennifer Herbert , xen-devel@lists.xen.org Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org On 01/07/15 18:37, Jennifer Herbert wrote: > The only place that jumps to 'err:' does so because !dom, which is > rechecked in 'err:'. This patch simplifies, giving the same result. > > Signed-off-by: Jennifer Herbert Coverity-ID: 1055188 ~Andrew > --- > tools/libxc/xc_dom_core.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c > index b100ce1..cde943c 100644 > --- a/tools/libxc/xc_dom_core.c > +++ b/tools/libxc/xc_dom_core.c > @@ -720,7 +720,7 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, > __FUNCTION__, cmdline, features); > dom = malloc(sizeof(*dom)); > if ( !dom ) > - goto err; > + return NULL; > > memset(dom, 0, sizeof(*dom)); > dom->xch = xch; > @@ -742,11 +742,6 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch, > > dom->alloc_malloc += sizeof(*dom); > return dom; > - > - err: > - if ( dom ) > - xc_dom_release(dom); > - return NULL; > } > > int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz)