From nobody Sun Jul 13 03:34:07 2025 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 1486049804258328.30900925536275; Thu, 2 Feb 2017 07:36:44 -0800 (PST) Received: from localhost ([::1]:57317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZJR9-0003bg-G2 for importer@patchew.org; Thu, 02 Feb 2017 10:36:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZIkW-000527-Da for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZIkV-0004Jz-Lc for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37032) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZIkV-0004Jt-FP for qemu-devel@nongnu.org; Thu, 02 Feb 2017 09:52:35 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 8CB7F7E9DE for ; Thu, 2 Feb 2017 14:52:35 +0000 (UTC) Received: from localhost (ovpn-116-38.phx2.redhat.com [10.3.116.38]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v12EqXxl010116; Thu, 2 Feb 2017 09:52:34 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 2 Feb 2017 18:51:30 +0400 Message-Id: <20170202145141.17138-12-marcandre.lureau@redhat.com> In-Reply-To: <20170202145141.17138-1-marcandre.lureau@redhat.com> References: <20170202145141.17138-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 02 Feb 2017 14:52:35 +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 11/22] 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: pbonzini@redhat.com, =?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 --- 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