From nobody Tue Feb 10 01:19:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1620136979; cv=none; d=zohomail.com; s=zohoarc; b=YHVBnrZNz2dec9BBCNNaUcs/AFFBdx0Y9fnkjNU3lLvTCXZ0XfyY1QHjTEbO7sJxvfxn5z6ySif2KcEbYhNZMvUt/77ULSuwIiE0QWb2/E4OtS8iZo+huHFOjT8ZI9TrAjZbAOR8jUgOo4UqOO8GFV1/NW7feaCfa2+Is0KL57c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620136979; h=Content-Type:Content-Transfer-Encoding:Cc: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=1SKSc3eFpYaYQN0b4i9nO90iwn+67p0EieBZgZAAfJQ=; b=hvWbAfuorNwVjwlbis/CMeJf/kNejEhfANLBipFVEQXsLZrsRRIK+nlyLHHd5qsaB/T4xSCCaGFbGZtI8u6TWqRWgkR7EfYDIU68VuxXTQrKON+zDC/Z0dx3XreBNRKBUfp6byJp083x/nZ38YxgQeq/dlLPavOiulkk8QIyen0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 162013697956213.96649423147835; Tue, 4 May 2021 07:02:59 -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-296-GWnK6nllOOWQYPQgUL8auQ-1; Tue, 04 May 2021 10:02:53 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9017802B7A; Tue, 4 May 2021 14:02:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 914A35C238; Tue, 4 May 2021 14:02:46 +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 53E125534C; Tue, 4 May 2021 14:02:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 144E2gRl013120 for ; Tue, 4 May 2021 10:02:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 574D81895D; Tue, 4 May 2021 14:02:42 +0000 (UTC) Received: from work.redhat.com (ovpn-115-86.ams2.redhat.com [10.36.115.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E1DA60C0F; Tue, 4 May 2021 14:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620136976; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=1SKSc3eFpYaYQN0b4i9nO90iwn+67p0EieBZgZAAfJQ=; b=Za2WAxSeQrvdjCcDwzfrmKgMnuTS0KSrdnqiyis2xr4d1NBkTabh24YnnWPq58pxG6ASME Kh9VI9fnePdIFpAM9Zo/x8E5DW4kypfHdMvo2dE9orZYY0DY/dIF/vrK+dY1TJJULM1Zum J2YrNDlB8H59G2vxkpUrPBTD7DegaSc= X-MC-Unique: GWnK6nllOOWQYPQgUL8auQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virDomainRedirFilterUSBDevDefParseXML: Use g_auto* Date: Tue, 4 May 2021 16:02:26 +0200 Message-Id: <20210504140235.132300-2-twiederh@redhat.com> In-Reply-To: <20210504140235.132300-1-twiederh@redhat.com> References: <20210504140235.132300-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0050b952f3..5822f3d85a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14689,7 +14689,7 @@ virDomainRedirFilterUSBVersionHelper(const char *ve= rsion, static virDomainRedirFilterUSBDevDef * virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node) { - virDomainRedirFilterUSBDevDef *def; + g_autofree virDomainRedirFilterUSBDevDef *def =3D NULL; g_autofree char *version =3D NULL; virTristateBool allow; =20 @@ -14697,42 +14697,38 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr = node) =20 def->usbClass =3D -1; if (virXMLPropInt(node, "class", 0, VIR_XML_PROP_NONE, &def->usbClass)= < 0) - goto error; + return NULL; =20 if (def->usbClass !=3D -1 && def->usbClass &~ 0xFF) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid USB Class code 0x%x"), def->usbClass); - goto error; + return NULL; } =20 def->vendor =3D -1; if (virXMLPropInt(node, "vendor", 0, VIR_XML_PROP_NONE, &def->vendor) = < 0) - goto error; + return NULL; =20 def->product =3D -1; if (virXMLPropInt(node, "product", 0, VIR_XML_PROP_NONE, &def->product= ) < 0) - goto error; + return NULL; =20 version =3D virXMLPropString(node, "version"); if (version) { if (STREQ(version, "-1")) def->version =3D -1; else if ((virDomainRedirFilterUSBVersionHelper(version, def)) < 0) - goto error; + return NULL; } else { def->version =3D -1; } =20 if (virXMLPropTristateBool(node, "allow", VIR_XML_PROP_REQUIRED, &allo= w) < 0) - goto error; + return NULL; =20 def->allow =3D allow =3D=3D VIR_TRISTATE_BOOL_YES; =20 - return def; - - error: - VIR_FREE(def); - return NULL; + return g_steal_pointer(&def); } =20 static virDomainRedirFilterDef * --=20 2.26.3