From nobody Sun Sep 7 23:48:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756277628; cv=none; d=zohomail.com; s=zohoarc; b=TfS9DExerTo7rqzEvdkJaK695Yp4XskjLc8v76GROzMY/LPDmKzrL0dIs+1H5a0OHLWeKp9HpxKbJYlx7XCx3ABcwc9Krb+3GP8rynKW2atDG6HWAPoAF4NfxHeeJ6jRfdK3YUrEgNlBtKx4j20xptwJEuFaOIxI64spYICVW/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756277628; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=eZCiHWv+Q5UyatSFerQbBQyU89nc66Sf4CoJPcZ+vBM=; b=jq1sll7BhiqQVDEY45tLKpfLJI980a32B/J0iQW8hySbNkNO0gmF/eJPX/9/FQoEprN7nn00oP1uWbB18yC9Dq+h3QAT7ppC1ZuM2BWjwhX2tJ8xMIMbiFsrjqL+JWddBXL1aek09Q//Igqgl8mHoHNnkwtExvdSGgP4nzcIZ4w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756277628314694.8991215184136; Tue, 26 Aug 2025 23:53:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 78BEC43F64; Wed, 27 Aug 2025 02:53:47 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 16354440AE; Wed, 27 Aug 2025 02:50:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2D1AF43F40; Wed, 27 Aug 2025 02:50:15 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6D42D43F3A for ; Wed, 27 Aug 2025 02:50:14 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-roR_yRaVP9anZrfXBzLuUA-1; Wed, 27 Aug 2025 02:50:11 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6CE421800561 for ; Wed, 27 Aug 2025 06:50:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A7EDD1800290 for ; Wed, 27 Aug 2025 06:50:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756277413; h=from:from: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; bh=eZCiHWv+Q5UyatSFerQbBQyU89nc66Sf4CoJPcZ+vBM=; b=XuuVUUYFKrOdAfQpnQsJtWyga3Fu/ZHx7SmVUA/zTjmqBXFwe9INbzL2NETM1VEzh3Gc/A 2TfrlqPksyvm9DXTXtElN+AykeuNO0A8VSPyulFCSnNA2iME0FClzNb5YmwfVAYI9HezDu ex/PmI2Dks8LGg9N9vjQSE/pOYrPhjU= X-MC-Unique: roR_yRaVP9anZrfXBzLuUA-1 X-Mimecast-MFC-AGG-ID: roR_yRaVP9anZrfXBzLuUA_1756277410 To: devel@lists.libvirt.org Subject: [PATCH 1/2] datatypes: virGetStream: Add missing 'virCheckConnectReturn' check Date: Wed, 27 Aug 2025 08:50:05 +0200 Message-ID: <96fd57f33ea8677f1ef8fdcdd0be9c53894deb1f.1756277371.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: x7falWfjQgPCgUHZWO6ck7CoCDjWE3Yda7639F5-5ZY_1756277410 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LQLPKY23QART3B6W6UIBDYVWJXE6N6FK X-Message-ID-Hash: LQLPKY23QART3B6W6UIBDYVWJXE6N6FK X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756277629919116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The 'virGet*' helpers check that the passed objects which are used to construct the new object are valid. The check that the 'conn' object in 'virStreamGet' was missing. Signed-off-by: Peter Krempa --- src/datatypes.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/datatypes.c b/src/datatypes.c index c83a74edd5..4e72855ebc 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -798,6 +798,8 @@ virGetStream(virConnectPtr conn) if (virDataTypesInitialize() < 0) return NULL; + virCheckConnectReturn(conn, NULL); + if (!(ret =3D virObjectNew(virStreamClass))) return NULL; --=20 2.51.0 From nobody Sun Sep 7 23:48:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756277558; cv=none; d=zohomail.com; s=zohoarc; b=KSR7Y1/MvXJJq2s8i5MkPdnu8zCSMrY8CfX68YQTrc8XMBDo0xFhQKyNosRujt5nI1vr0d4L9au9n7TG+ubBy/wTgkvdxD67MjJvkETwwTb4SUqP+yPJOSgRnt2aKm7K+LzdNpsgGUakpK61op7C5cyRO8a8oqegbSUQSZon7w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756277558; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=u4p3z5p36YTqpSWpbzz45ASbfzMqpNb1/9Y6fYe4exc=; b=gQQfckbaiFz34nS+ZhEtecp16YhtAofZJ2VfzUEr4S+1umXAgZHpsfGQx3SZPxi3lQ79ab9+uovqnEWPNR+0xvA8+lFXwiheF5bYdB8owo3/rH49HPLhf6JES6ujmONMJ/n6wFGMwbpkSvvwMlvVDGIMv8GF14umlMSoCEsy/o8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756277558744604.8251203530098; Tue, 26 Aug 2025 23:52:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3984543F88; Wed, 27 Aug 2025 02:52:38 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D361844064; Wed, 27 Aug 2025 02:50:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 106FA43F45; Wed, 27 Aug 2025 02:50:15 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5F88D43F1B for ; Wed, 27 Aug 2025 02:50:14 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-JZXv8YTJOM6mITxuLRUsiA-1; Wed, 27 Aug 2025 02:50:12 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A34DA18003FD for ; Wed, 27 Aug 2025 06:50:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E893E180047F for ; Wed, 27 Aug 2025 06:50:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756277414; h=from:from: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; bh=u4p3z5p36YTqpSWpbzz45ASbfzMqpNb1/9Y6fYe4exc=; b=Xe8laAoiPrfWCYMFmMY+N5D3P7DmZj+CF14Z1U2VdOsxVnpEeu9Yjdxg7NbiLAG3sIqwqw cdiCKVDDsqgXvDXKKQqmJ2x9triCapkrirZQvoP2zZz4WtomrvQloBSn9kWobKeqSjAgUS Oo48NhC/dUktk5wawFOYEe1HzcG+IrQ= X-MC-Unique: JZXv8YTJOM6mITxuLRUsiA-1 X-Mimecast-MFC-AGG-ID: JZXv8YTJOM6mITxuLRUsiA_1756277411 To: devel@lists.libvirt.org Subject: [PATCH 2/2] datatypes: Refactor rest of 'virGet*' helpers Date: Wed, 27 Aug 2025 08:50:06 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: N0TdVWnlAeSMddwYZbxCAhZB7vME9kAIIVqskCoHBrc_1756277411 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RQKIDDYNV3KFRSFC34BTRBX3SPD6IYX6 X-Message-ID-Hash: RQKIDDYNV3KFRSFC34BTRBX3SPD6IYX6 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756277561123124100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Similarly to the refactor of 'virGetDomain' done in commit 3de56902d32 rework the code to assume that 'virObjectNew' can't return NULL and use the 'virCheck*Return' helpers to avoid an 'error:' label. Signed-off-by: Peter Krempa --- src/datatypes.c | 175 ++++++++++++------------------------------------ 1 file changed, 44 insertions(+), 131 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 4e72855ebc..941e7f9da2 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -349,23 +349,16 @@ virGetNetwork(virConnectPtr conn, const char *name, c= onst unsigned char *uuid) if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(uuid, error); - - if (!(ret =3D virObjectNew(virNetworkClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(uuid, NULL); + ret =3D virObjectNew(virNetworkClass); ret->name =3D g_strdup(name); - ret->conn =3D virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); return ret; - - error: - virObjectUnref(ret); - return NULL; } /** @@ -410,20 +403,14 @@ virGetNetworkPort(virNetworkPtr net, const unsigned c= har *uuid) if (virDataTypesInitialize() < 0) return NULL; - virCheckNetworkGoto(net, error); - virCheckNonNullArgGoto(uuid, error); - - if (!(ret =3D virObjectNew(virNetworkPortClass))) - goto error; + virCheckNetworkReturn(net, NULL); + virCheckNonNullArgReturn(uuid, NULL); + ret =3D virObjectNew(virNetworkPortClass); ret->net =3D virObjectRef(net); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); return ret; - - error: - virObjectUnref(ret); - return NULL; } /** @@ -468,26 +455,19 @@ virGetInterface(virConnectPtr conn, const char *name,= const char *mac) if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); /* a NULL mac from caller is okay. Treat it as blank */ if (mac =3D=3D NULL) mac =3D ""; - if (!(ret =3D virObjectNew(virInterfaceClass))) - goto error; - + ret =3D virObjectNew(virInterfaceClass); ret->name =3D g_strdup(name); ret->mac =3D g_strdup(mac); - ret->conn =3D virObjectRef(conn); return ret; - - error: - virObjectUnref(ret); - return NULL; } /** @@ -535,15 +515,12 @@ virGetStoragePool(virConnectPtr conn, const char *nam= e, if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(uuid, error); - - if (!(ret =3D virObjectNew(virStoragePoolClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(uuid, NULL); + ret =3D virObjectNew(virStoragePoolClass); ret->name =3D g_strdup(name); - ret->conn =3D virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); @@ -552,10 +529,6 @@ virGetStoragePool(virConnectPtr conn, const char *name, ret->privateDataFreeFunc =3D freeFunc; return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -609,18 +582,15 @@ virGetStorageVol(virConnectPtr conn, const char *pool= , const char *name, if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(pool, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(key, error); - - if (!(ret =3D virObjectNew(virStorageVolClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(pool, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(key, NULL); + ret =3D virObjectNew(virStorageVolClass); ret->pool =3D g_strdup(pool); ret->name =3D g_strdup(name); ret->key =3D g_strdup(key); - ret->conn =3D virObjectRef(conn); /* set driver specific data */ @@ -628,10 +598,6 @@ virGetStorageVol(virConnectPtr conn, const char *pool,= const char *name, ret->privateDataFreeFunc =3D freeFunc; return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -679,20 +645,14 @@ virGetNodeDevice(virConnectPtr conn, const char *name) if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); - - if (!(ret =3D virObjectNew(virNodeDeviceClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); + ret =3D virObjectNew(virNodeDeviceClass); ret->name =3D g_strdup(name); - ret->conn =3D virObjectRef(conn); - return ret; - error: - virObjectUnref(ret); - return NULL; + return ret; } @@ -738,23 +698,16 @@ virGetSecret(virConnectPtr conn, const unsigned char = *uuid, if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(uuid, error); - - if (!(ret =3D virObjectNew(virSecretClass))) - return NULL; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(uuid, NULL); + ret =3D virObjectNew(virSecretClass); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); ret->usageType =3D usageType; ret->usageID =3D g_strdup(NULLSTR_EMPTY(usageID)); - ret->conn =3D virObjectRef(conn); return ret; - - error: - virObjectUnref(ret); - return NULL; } /** @@ -800,9 +753,7 @@ virGetStream(virConnectPtr conn) virCheckConnectReturn(conn, NULL); - if (!(ret =3D virObjectNew(virStreamClass))) - return NULL; - + ret =3D virObjectNew(virStreamClass); ret->conn =3D virObjectRef(conn); return ret; @@ -850,24 +801,16 @@ virGetNWFilter(virConnectPtr conn, const char *name, if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(uuid, error); - - if (!(ret =3D virObjectNew(virNWFilterClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(uuid, NULL); + ret =3D virObjectNew(virNWFilterClass); ret->name =3D g_strdup(name); - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - ret->conn =3D virObjectRef(conn); return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -915,23 +858,15 @@ virGetNWFilterBinding(virConnectPtr conn, const char = *portdev, if (virDataTypesInitialize() < 0) return NULL; - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(portdev, error); - - if (!(ret =3D virObjectNew(virNWFilterBindingClass))) - goto error; + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(portdev, NULL); + ret =3D virObjectNew(virNWFilterBindingClass); ret->portdev =3D g_strdup(portdev); - ret->filtername =3D g_strdup(filtername); - ret->conn =3D virObjectRef(conn); return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -977,20 +912,14 @@ virGetDomainCheckpoint(virDomainPtr domain, if (virDataTypesInitialize() < 0) return NULL; - virCheckDomainGoto(domain, error); - virCheckNonNullArgGoto(name, error); + virCheckDomainReturn(domain, NULL); + virCheckNonNullArgReturn(name, NULL); - if (!(ret =3D virObjectNew(virDomainCheckpointClass))) - goto error; + ret =3D virObjectNew(virDomainCheckpointClass); ret->name =3D g_strdup(name); - ret->domain =3D virObjectRef(domain); return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -1033,20 +962,14 @@ virGetDomainSnapshot(virDomainPtr domain, const char= *name) if (virDataTypesInitialize() < 0) return NULL; - virCheckDomainGoto(domain, error); - virCheckNonNullArgGoto(name, error); + virCheckDomainReturn(domain, NULL); + virCheckNonNullArgReturn(name, NULL); - if (!(ret =3D virObjectNew(virDomainSnapshotClass))) - goto error; + ret =3D virObjectNew(virDomainSnapshotClass); ret->name =3D g_strdup(name); - ret->domain =3D virObjectRef(domain); return ret; - - error: - virObjectUnref(ret); - return NULL; } @@ -1171,18 +1094,13 @@ virAdmGetServer(virAdmConnectPtr conn, const char *= name) virAdmServerPtr ret =3D NULL; if (virDataTypesInitialize() < 0) - goto error; + return NULL; - if (!(ret =3D virObjectNew(virAdmServerClass))) - goto error; + ret =3D virObjectNew(virAdmServerClass); ret->name =3D g_strdup(name); - ret->conn =3D virObjectRef(conn); return ret; - error: - virObjectUnref(ret); - return NULL; } static void @@ -1202,20 +1120,15 @@ virAdmGetClient(virAdmServerPtr srv, const unsigned= long long id, virAdmClientPtr ret =3D NULL; if (virDataTypesInitialize() < 0) - goto error; - - if (!(ret =3D virObjectNew(virAdmClientClass))) - goto error; + return NULL; + ret =3D virObjectNew(virAdmClientClass); ret->id =3D id; ret->timestamp =3D timestamp; ret->transport =3D transport; ret->srv =3D virObjectRef(srv); return ret; - error: - virObjectUnref(ret); - return NULL; } static void --=20 2.51.0