From nobody Sat Apr 27 19:57:25 2024 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.zoho.com; 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 1486541439499551.7470951884092; Wed, 8 Feb 2017 00:10:39 -0800 (PST) Received: from localhost ([::1]:58204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbNKo-0005sn-0H for importer@patchew.org; Wed, 08 Feb 2017 03:10:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbNJQ-0005EP-2g for qemu-devel@nongnu.org; Wed, 08 Feb 2017 03:09:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbNJL-0004Ax-4G for qemu-devel@nongnu.org; Wed, 08 Feb 2017 03:09:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cbNJK-00049J-UZ; Wed, 08 Feb 2017 03:09:07 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26193C05AA5B; Wed, 8 Feb 2017 08:09:07 +0000 (UTC) Received: from localhost (ovpn-116-15.phx2.redhat.com [10.3.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 185A09244E; Wed, 8 Feb 2017 08:09:05 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 8 Feb 2017 12:09:00 +0400 Message-Id: <20170208080900.4092-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 08 Feb 2017 08:09:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] qcow2: remove useless NULL check 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: kwolf@redhat.com, qemu-trivial@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" g_strdup() already handles the case where the argument is NULL. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- block/qcow2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 96fb8a8f16..9114218030 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2016,8 +2016,8 @@ static int qcow2_change_backing_file(BlockDriverState= *bs, g_free(s->image_backing_file); g_free(s->image_backing_format); =20 - s->image_backing_file =3D backing_file ? g_strdup(bs->backing_file) : = NULL; - s->image_backing_format =3D backing_fmt ? g_strdup(bs->backing_format)= : NULL; + s->image_backing_file =3D g_strdup(bs->backing_file); + s->image_backing_format =3D g_strdup(bs->backing_format); =20 return qcow2_update_header(bs); } --=20 2.11.0.295.gd7dffce1c.dirty