From nobody Mon Feb 9 07:41:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504008621196123.33679212213985; Tue, 29 Aug 2017 05:10:21 -0700 (PDT) Received: from localhost ([::1]:44634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmfLW-0000L9-NU for importer@patchew.org; Tue, 29 Aug 2017 08:10:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmfKa-00085n-6t for qemu-devel@nongnu.org; Tue, 29 Aug 2017 08:09:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmfKU-0001sN-AG for qemu-devel@nongnu.org; Tue, 29 Aug 2017 08:09:20 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:49623) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmfKT-0001qd-TN; Tue, 29 Aug 2017 08:09:14 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1dmfKR-0003qS-5L; Tue, 29 Aug 2017 14:09:11 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1dmfK9-0004CH-LN; Tue, 29 Aug 2017 15:08:53 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Message-Id:Date:Subject:Cc:To:From; bh=VGj5ndmh8/b7UT9bF4crQ8bs77yQjpMo3uHteM9CRH8=; b=qAswsg/L1W9wG0FT5++zID+82YczjutkePgZTf5pjcz4EG4nYhj9wnxuaQGpt5L4xvBRN5DPDlnecXgwDarGzgUVm4tWMHU7Uy59yt2l2v8AbWe5brcZkgKiWbaYkEK+3Mc8ecVQJRoBpTuYf+r2HZ6aglgMmaKVQurl7NmN4fzt+VSvuxuacIUJVfQhnsGrKPBBn8cwqpmE2gUPUYLrdH0jBW1eZPLKPqNS3dVCPh4c4o1jp3Xf93e1zjgiLA8DLhaUmA3/8bP3OVhO3vj2HLlj9xbtkRSXGpIra81IyQA6P9Oua4RUnF4LKgDMtxkOoEWCb2MYFc/AdEFxh1kcMw==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Tue, 29 Aug 2017 15:08:36 +0300 Message-Id: <20170829120836.16091-1-berto@igalia.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH] misc: Remove unused Error variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's a few cases which we're passing an Error pointer to a function only to discard it immediately afterwards without checking it. In these cases we can simply remove the variable and pass NULL instead. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qcow.c | 12 +++--------- block/qcow2.c | 8 ++------ dump.c | 4 +--- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index c08cdc4a7b..63904a26ee 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -454,13 +454,11 @@ static uint64_t get_cluster_offset(BlockDriverState *= bs, start_sect =3D (offset & ~(s->cluster_size - 1)) >> 9; for(i =3D 0; i < s->cluster_sectors; i++) { if (i < n_start || i >=3D n_end) { - Error *err =3D NULL; memset(s->cluster_data, 0x00, 512); if (qcrypto_block_encrypt(s->crypto, start_sec= t + i, s->cluster_data, BDRV_SECTOR_SIZE, - &err) < 0) { - error_free(err); + NULL) < 0) { errno =3D EIO; return -1; } @@ -572,7 +570,6 @@ static coroutine_fn int qcow_co_readv(BlockDriverState = *bs, int64_t sector_num, QEMUIOVector hd_qiov; uint8_t *buf; void *orig_buf; - Error *err =3D NULL; =20 if (qiov->niov > 1) { buf =3D orig_buf =3D qemu_try_blockalign(bs, qiov->size); @@ -637,7 +634,7 @@ static coroutine_fn int qcow_co_readv(BlockDriverState = *bs, int64_t sector_num, if (bs->encrypted) { assert(s->crypto); if (qcrypto_block_decrypt(s->crypto, sector_num, buf, - n * BDRV_SECTOR_SIZE, &err) < 0)= { + n * BDRV_SECTOR_SIZE, NULL) < 0)= { goto fail; } } @@ -660,7 +657,6 @@ done: return ret; =20 fail: - error_free(err); ret =3D -EIO; goto done; } @@ -709,11 +705,9 @@ static coroutine_fn int qcow_co_writev(BlockDriverStat= e *bs, int64_t sector_num, break; } if (bs->encrypted) { - Error *err =3D NULL; assert(s->crypto); if (qcrypto_block_encrypt(s->crypto, sector_num, buf, - n * BDRV_SECTOR_SIZE, &err) < 0) { - error_free(err); + n * BDRV_SECTOR_SIZE, NULL) < 0) { ret =3D -EIO; break; } diff --git a/block/qcow2.c b/block/qcow2.c index 40ba26c111..fbfffadc76 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1820,15 +1820,13 @@ static coroutine_fn int qcow2_co_preadv(BlockDriver= State *bs, uint64_t offset, assert(s->crypto); assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - Error *err =3D NULL; if (qcrypto_block_decrypt(s->crypto, (s->crypt_physical_offset ? cluster_offset + offset_in_clus= ter : offset) >> BDRV_SECTOR_BITS, cluster_data, cur_bytes, - &err) < 0) { - error_free(err); + NULL) < 0) { ret =3D -EIO; goto fail; } @@ -1942,7 +1940,6 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverS= tate *bs, uint64_t offset, qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes); =20 if (bs->encrypted) { - Error *err =3D NULL; assert(s->crypto); if (!cluster_data) { cluster_data =3D qemu_try_blockalign(bs->file->bs, @@ -1963,8 +1960,7 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverS= tate *bs, uint64_t offset, cluster_offset + offset_in_cluster : offset) >> BDRV_SECTOR_BITS, cluster_data, - cur_bytes, &err) < 0) { - error_free(err); + cur_bytes, NULL) < 0) { ret =3D -EIO; goto fail; } diff --git a/dump.c b/dump.c index d9090a24cc..a79773d0f7 100644 --- a/dump.c +++ b/dump.c @@ -1695,10 +1695,8 @@ static void dump_process(DumpState *s, Error **errp) =20 static void *dump_thread(void *data) { - Error *err =3D NULL; DumpState *s =3D (DumpState *)data; - dump_process(s, &err); - error_free(err); + dump_process(s, NULL); return NULL; } =20 --=20 2.11.0