From nobody Sun Nov 16 06:32:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592234263; cv=none; d=zohomail.com; s=zohoarc; b=RnSWo6pmvTFbRF9QZKRieKmSnMLgeBg1KWiZPzf0w6gXnpkGTUT96M/XAZLRZnueHS2LxwKHQKK13IUgkzD9oqWt12QQVy35rgAs7jqA6cpYGk4TC8udmzShBPnJKN1QhnCtxeUvhxuR3Dlmjioomk/w4Xfet38ypZkKpLqSO6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592234263; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dnlXchZBvJOXh+jRt6F3KFOl0R377niWc9RM5c/3UsQ=; b=drxt+O2WxFOVHx4kbwJeskL43gxL4Mk0IM2aKAxSI1XZWNeRlgdk2251U3Ob4tOeI4m2zu8fGNXIE4zZII4N5vNCaC+bljVPgirb0UyMb+Sds2sR9yGUKQ3l5fSnA/X91oX5YJJkUGJpLaNoq2G+deUO9GK+KEuedKG6Wb/sPWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592234263813907.8845910353721; Mon, 15 Jun 2020 08:17:43 -0700 (PDT) Received: from localhost ([::1]:47934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkqrm-0000mw-KM for importer@patchew.org; Mon, 15 Jun 2020 11:17:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkqp9-0005aG-Jp for qemu-devel@nongnu.org; Mon, 15 Jun 2020 11:14:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59017 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkqp8-0008Hr-4B for qemu-devel@nongnu.org; Mon, 15 Jun 2020 11:14:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-EJMFu99cMVqctWWrGYQedA-1; Mon, 15 Jun 2020 11:14:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8F5A6BF44; Mon, 15 Jun 2020 15:14:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0A9B1001B2B; Mon, 15 Jun 2020 15:14:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 87D1A1753C; Mon, 15 Jun 2020 17:14:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592234097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=dnlXchZBvJOXh+jRt6F3KFOl0R377niWc9RM5c/3UsQ=; b=cTHlX+FDcIuWqoEn9wAkC6RWuSxwFkF6UcVFlUO+OF108HYlGp9sxAfkOlM94p5fjN5yL/ HSHKKme2mOK+XD7FWLtV6T/8Ast0Rikt8an7qocUuRiedjj10KaYyO2l0k+fYYbrk/Hr47 dHZzg5S6CJsSZCMuyLlAIOKgZNavdE0= X-MC-Unique: EJMFu99cMVqctWWrGYQedA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/4] sm501: Drop unneded variable Date: Mon, 15 Jun 2020 17:14:47 +0200 Message-Id: <20200615151449.19818-3-kraxel@redhat.com> In-Reply-To: <20200615151449.19818-1-kraxel@redhat.com> References: <20200615151449.19818-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:17:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan We don't need a separate variable to keep track if we allocated memory that needs to be freed as we can test the pointer itself. Signed-off-by: BALATON Zoltan Message-id: 7a818701887a77af17995aa062b37f92ffc3d2eb.1591471056.git.balaton= @eik.bme.hu Signed-off-by: Gerd Hoffmann --- hw/display/sm501.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 5ae320ddc325..85d54b598f80 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -796,13 +796,12 @@ static void sm501_2d_operation(SM501State *s) de =3D db + width + height * (width + dst_pitch); if (rtl && ((db >=3D sb && db <=3D se) || (de >=3D sb && de <= =3D se))) { /* regions may overlap: copy via temporary */ - int free_buf =3D 0, llb =3D width * (1 << format); + int llb =3D width * (1 << format); int tmp_stride =3D DIV_ROUND_UP(llb, sizeof(uint32_t)); uint32_t *tmp =3D tmp_buf; =20 if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_bu= f)) { tmp =3D g_malloc(tmp_stride * sizeof(uint32_t) * heigh= t); - free_buf =3D 1; } pixman_blt((uint32_t *)&s->local_mem[src_base], tmp, src_pitch * (1 << format) / sizeof(uint32_t), @@ -813,7 +812,7 @@ static void sm501_2d_operation(SM501State *s) dst_pitch * (1 << format) / sizeof(uint32_t), 8 * (1 << format), 8 * (1 << format), 0, 0, dst_x, dst_y, width, height); - if (free_buf) { + if (tmp !=3D tmp_buf) { g_free(tmp); } } else { --=20 2.18.4