From nobody Sun Feb 8 10:04:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600884937; cv=none; d=zohomail.com; s=zohoarc; b=N0HQrHtfo3uYrqfMdB0S2vvSY9ayF0wDClF7klk9Y1DVeJaRlrhXbRb2E8DW+PdVKnk8Nc/Wity4FIYpoS6yLBb3/CzGKwfUaVUAwvduLP+G0MCV6fBNNA6DRPyKbpoopIwV26mVS5gapDy9D8OwaIK74SGhOpognvK+1poZym0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600884937; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZZbEn/5GkpFaq+qL240dTpGqSDXINlpItzMMSle0pME=; b=l+W0puvqFoRJo28VI3IzaX+uaEvj/4SBhyRQa2OrJuwgbW9Chue2jULRHB5BW9c8TUwWaCMSBpn9s+FBC9xf4YJ9bgFOrpma873JniBuKBKdswxx8hbLGnDsEMlVpePqdl55WKGTXvNBqxLBgHA4ThBXTMKu6ZNArcM5YgId3Es= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 160088493763932.35134022248906; Wed, 23 Sep 2020 11:15:37 -0700 (PDT) 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-344-THYaF6c4OK69ViJ6eQKmAA-1; Wed, 23 Sep 2020 14:15:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8918810BBED0; Wed, 23 Sep 2020 18:15:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 666BC60BEC; Wed, 23 Sep 2020 18:15:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 28A24183D04E; Wed, 23 Sep 2020 18:15:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NIFFGY018109 for ; Wed, 23 Sep 2020 14:15:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id E93487882C; Wed, 23 Sep 2020 18:15:15 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70D4B78823 for ; Wed, 23 Sep 2020 18:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600884936; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZZbEn/5GkpFaq+qL240dTpGqSDXINlpItzMMSle0pME=; b=GgjNYtqxFm+Auy+VaWZeNag3uBCoEs7sXryn70Re9y3WrOov3uBLEYzABo5LVF3tsMQ0Rc Uy7yUNBTJKugbVDW29dODjQ5USNLqHPtiEcJ3RjF55ch85CLj6DcLBr55y9LiYAv+7nVhd OBST2M7wcbsRLmd20i1g3H4ujQsSpz4= X-MC-Unique: THYaF6c4OK69ViJ6eQKmAA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/14] api: virDomainMemoryStats: use 'ret' variable Date: Wed, 23 Sep 2020 20:14:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Instead of 'nr_stats_ret'. Also reduce its scope. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Martin Kletzander --- src/libvirt-domain.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index cde86c77e8..415482a526 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5741,7 +5741,6 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemor= yStatPtr stats, unsigned int nr_stats, unsigned int flags) { virConnectPtr conn; - unsigned long nr_stats_ret =3D 0; =20 VIR_DOMAIN_DEBUG(dom, "stats=3D%p, nr_stats=3D%u, flags=3D0x%x", stats, nr_stats, flags); @@ -5758,11 +5757,10 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMem= oryStatPtr stats, =20 conn =3D dom->conn; if (conn->driver->domainMemoryStats) { - nr_stats_ret =3D conn->driver->domainMemoryStats(dom, stats, nr_st= ats, - flags); - if (nr_stats_ret =3D=3D -1) + int ret =3D conn->driver->domainMemoryStats(dom, stats, nr_stats, = flags); + if (ret =3D=3D -1) goto error; - return nr_stats_ret; + return ret; } =20 virReportUnsupportedError(); --=20 2.26.2