From nobody Tue Feb 10 23:01:20 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=1641993104; cv=none; d=zohomail.com; s=zohoarc; b=fGOD63R8htakhW2epxta2fmHMx8U05ivO5Xr3rdfg7mnPDYnJ16zxiNOpdsgam4qQmGlB/FylQSKUg5LhqHL55zNEq3zAou1RKL1VoYZsMHZC1TTDb0FRDo2fvzkaYcmA+ZOYzRwTO9rfhejwc5xzN2jAFWjH6TmyQHmmXFCUN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641993104; 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=44Q9jWDVYuuJIFOCgrt5BE2QrRvZRtC1X1Xe/vwOabI=; b=IBqi5yljoS2p4QQip/jPb2wwI3Rqi/FCeP4M2kbeupr6eylc8fpmw5tH0DOwsqSQ7JojvOjqmHTDEdQbEtZ0xww248FZysUG98xRr6wwPvqup+iGREHXGOG/Nqfno+OVn7gydaHC1ZBTAXO077luX0iEm3Ifg47CMDRpYAgt1R8= 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) 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 1641993104796859.6095271398732; Wed, 12 Jan 2022 05:11:44 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-DkZYUXxiMlqzOhX3WygF5Q-1; Wed, 12 Jan 2022 08:11:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBE81192FDA7; Wed, 12 Jan 2022 13:11:35 +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 97DFC56F90; Wed, 12 Jan 2022 13:11:35 +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 6711A4A7CA; Wed, 12 Jan 2022 13:11:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20CDB6r3004282 for ; Wed, 12 Jan 2022 08:11:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 61CAF26358; Wed, 12 Jan 2022 13:11:06 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FAA82634A; Wed, 12 Jan 2022 13:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641993103; 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=44Q9jWDVYuuJIFOCgrt5BE2QrRvZRtC1X1Xe/vwOabI=; b=Ezqtqdcrix9NJH3asryDa2961YPnsurqcK8ziDXrVAgMLYlMaZl8i0cWKpah2+5KiKn/DJ AvNFiDpnhEvqkK598hP9Bme7TMUlivJpCC+YQgaDlBoVLQMO7Ma/qhMHtJL7Sg7/IQx4yL nKFMYqKKLG7ET/N9QcXBG0k52hMqFQk= X-MC-Unique: DkZYUXxiMlqzOhX3WygF5Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/14] conf: interface: Preparation for g_auto Date: Wed, 12 Jan 2022 14:10:05 +0100 Message-Id: <20220112131015.100288-5-twiederh@redhat.com> In-Reply-To: <20220112131015.100288-1-twiederh@redhat.com> References: <20220112131015.100288-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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) X-ZM-MESSAGEID: 1641993105570100001 Content-Type: text/plain; charset="utf-8" These changes make the g_auto-ification in the next commit clearer. Signed-off-by: Tim Wiederhake --- src/conf/interface_conf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 150616bda9..cbe6aad957 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -453,14 +453,12 @@ virInterfaceDefParseIfAdressing(virInterfaceDef *def, } proto->family =3D tmp; if (STREQ(tmp, "ipv4")) { - ret =3D virInterfaceDefParseProtoIPv4(proto, ctxt); - if (ret !=3D 0) { + if (virInterfaceDefParseProtoIPv4(proto, ctxt) !=3D 0) { virInterfaceProtocolDefFree(proto); goto error; } } else if (STREQ(tmp, "ipv6")) { - ret =3D virInterfaceDefParseProtoIPv6(proto, ctxt); - if (ret !=3D 0) { + if (virInterfaceDefParseProtoIPv6(proto, ctxt) !=3D 0) { virInterfaceProtocolDefFree(proto); goto error; } @@ -741,10 +739,12 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, } =20 switch (type) { - case VIR_INTERFACE_TYPE_ETHERNET: - if ((tmp =3D virXPathString("string(./mac/@address)", ctxt))) - def->mac =3D tmp; + case VIR_INTERFACE_TYPE_ETHERNET: { + char *mac =3D virXPathString("string(./mac/@address)", ctxt); + if (mac !=3D NULL) + def->mac =3D mac; break; + } case VIR_INTERFACE_TYPE_BRIDGE: { xmlNodePtr bridge; =20 --=20 2.31.1