From patchwork Wed Nov 2 08:36:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 123238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8D373B6F70 for ; Wed, 2 Nov 2011 19:38:11 +1100 (EST) Received: from localhost ([::1]:43677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLWKk-0004dv-UP for incoming@patchwork.ozlabs.org; Wed, 02 Nov 2011 04:38:06 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLWKd-0004ZY-ML for qemu-devel@nongnu.org; Wed, 02 Nov 2011 04:38:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLWKc-0003pL-3S for qemu-devel@nongnu.org; Wed, 02 Nov 2011 04:37:59 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:38732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLWKb-0003ny-7C for qemu-devel@nongnu.org; Wed, 02 Nov 2011 04:37:58 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 Nov 2011 14:07:52 +0530 Received: from d28relay01.in.ibm.com ([9.184.220.58]) by e28smtp07.in.ibm.com ([192.168.1.137]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 2 Nov 2011 14:07:40 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pA28bcZg2658362; Wed, 2 Nov 2011 14:07:39 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pA28bbuU013804; Wed, 2 Nov 2011 14:07:37 +0530 Received: from wdongxu-T410.cn.ibm.com ([9.115.118.28]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pA28bYDa008899; Wed, 2 Nov 2011 14:07:36 +0530 From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 2 Nov 2011 16:36:21 +0800 Message-Id: <1320222981-3839-2-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320222981-3839-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1320222981-3839-1-git-send-email-wdongxu@linux.vnet.ibm.com> MIME-Version: 1.0 x-cbid: 11110208-8878-0000-0000-00000013D9EA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.7 Cc: qemu-trivial@nongnu.org, Dong Xu Wang , afaerber@suse.de, raywang@linux.vnet.ibm.com Subject: [Qemu-devel] =?utf-8?q?=5BPATCH_2/2=5D_block=3Ause_g=5Ffree_inste?= =?utf-8?q?ad_of_free_in_cloop=2Ec?= 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 From: Dong Xu Wang Fix mismatching allocation and deallocation: g_free should be used to pair with g_malloc. v3: Split to 2 patches: one for fixing coding style, one for replacing free with g_free. And correct other 2 places with coding style problem. v2: Fix spelling: gfree->g_free. v1: Use gfree, to pair with g_malloc. Also fix coding style. Reviewed-by: Andreas Färber Reviewed_by: Ray Wang Signed-off-by: Dong Xu Wang --- block/cloop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/cloop.c b/block/cloop.c index 799b6c2..7570eb8 100644 --- a/block/cloop.c +++ b/block/cloop.c @@ -171,10 +171,10 @@ static void cloop_close(BlockDriverState *bs) { BDRVCloopState *s = bs->opaque; if (s->n_blocks > 0) { - free(s->offsets); + g_free(s->offsets); } - free(s->compressed_block); - free(s->uncompressed_block); + g_free(s->compressed_block); + g_free(s->uncompressed_block); inflateEnd(&s->zstream); }