From nobody Fri Apr 19 01:06:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1539865697673344.7058724113657; Thu, 18 Oct 2018 05:28:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DEF273082B60; Thu, 18 Oct 2018 12:28:15 +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 9F62A67660; Thu, 18 Oct 2018 12:28:15 +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 2D8F118005B1; Thu, 18 Oct 2018 12:28:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w9ICRLsF026334 for ; Thu, 18 Oct 2018 08:27:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05E1E77F31; Thu, 18 Oct 2018 12:27:21 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 669B1611BC for ; Thu, 18 Oct 2018 12:27:20 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 18 Oct 2018 14:26:55 +0200 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [snmp PATCH 17/20] libvirtSnmp: Fix type of libvirtUnregisterEvents() 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 18 Oct 2018 12:28:16 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This function returns only a single value. It makes no sense to have it return that. Make it return void. Signed-off-by: Michal Privoznik --- src/libvirtSnmp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index 3a93bc6..2f2f406 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -227,14 +227,14 @@ libvirtRegisterEvents(virConnectPtr conn) } =20 /* Unregister domain events collection */ -int +static void libvirtUnregisterEvents(virConnectPtr conn) { - void *status; + if (callbackRet < 0) + return; =20 virConnectDomainEventDeregisterAny(conn, callbackRet); callbackRet =3D -1; - return 0; } =20 int libvirtSnmpInit(void) @@ -284,13 +284,11 @@ void libvirtSnmpShutdown(void) if (timer !=3D -1) virEventRemoveTimeout(timer); =20 - if (libvirtUnregisterEvents(conn)) { - printf("Failed to unregister domain events\n"); - } + libvirtUnregisterEvents(conn); =20 if ((rc =3D virConnectClose(conn))) { printLibvirtError("Failed to disconnect from hypervisor. " - "Leaked references: %d\n", rc); + "Leaked references: %d\n", rc); } } =20 --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list